Use correct collection class.
Minor tweaks.