More fixes to syntax highlighting