Various syntax corrections