Minor updates to collection handling