more collections fixes