additional fixes for collections