user-collection fixes