More HFA changes