More syntax fixes.