More fixes for collections