Changes to fix the the new CoreData errors.