more minor fixes to C semantics