More syntax fixes