Syntax fixes; error fixes