HypPhase issues fixed