more collection swapping fixes