Small fixes in the collection class.