More fixes for syntax highlighting