Minor improvements to SmartCollection integration