Collection fixes
Merge pull request #1 from isibner/master

Collection fixes