More syntax fixes to code