Various minor syntax fixes