some collection fixes