Bug/collection fixes