fixes to collection loading