Fix odd EDR scenario bugs William found [978]

Gang, hoping we can sneak this into 1.4 release.