collection fixes