Try to fix some bugs in the syntax highlighting