some fixes for collections