Fixes for the HoP's new duds
Merge pull request #601 from Jakkarra/Bleeding-Edge

Fixes for the HoP's new duds