Fixes to Core Data entities.