More HFA fixes