[Change] Small changes and fixes to the generic collections.