More HFTransferMeasure fixes