Syntax fixes 2