Bugfixes and minor improvements
- fixed/improved handling for read-only collections