Minor tweaks to the Coredata store class