Fixing some C things