Various collections fixes