Some C code fixes.