highlight fixes