Fix odd EDR scenario bugs William found [978]