clean up DATA RACE from Fatalf; avoid returning too early, actually wait for deeply nested actions to complete (flake)