Switch to using isolated collect_all

Also Fix some niggles introduced in last patch.