Fixed core data issues.