Small fixes to syntax highlighting