More syntax fixes..