Updates fixing some highlighting glitches