More highlight fixes