Syntax highlighting fixes