Syntax bug fixes