Various syntax fixes.