more fixes for restart collection bug