More minor syntax fixes