more collection fixes