some collections fixes