Little highlight fixes