Update to better error highlighting