Small tweaks to the way some of the highlighting works