list-collection fixes