Some fixes for plain C mode