More syntax highlighting fixes