Various C mode improvements
Misc