And still more fixes to the collection creation