More collection fixes