Fixed some collection stuff