Fixing after 588 hang

This sequence of commits tries to get of the hangs in the after_588 regression test that occur from time to time.