More HH optimizations (Credits to Vanir)