misc syntax fixes