Further syntax fixes