Minor fixes to collections support