More fixes to highlighting