Add some highlight hacks