Misc syntax fixes