Syntax fixes II