Syntax conformance test fixes