coredata fixes