Fixes for the HoP's new duds