More fixes to syntax