Syntax issue fixes