Fix a few minor issues regarding collections
Merge pull request #42 from inventid/fix-collection-issues

Fix a few minor issues regarding collections