More changes

C code changes