Improve highlighting of errors