Fix the collections stuff