Major syntax fixes