Various small syntax fixes