Corrected issues when saving colleciton references.