* more fixes to align with new collection bindings