Syntax and grammar tweaks