Syntax and grammar fixes