HoR fixes