Fixes for read-only collection interfaces