Hopperhock fixes.