further fixes to HOs due to E4X implementation change