another set of collection-related fixes