More HI fixes.