more fixes to C code.