Fixes to make sure syntax highlighting works