Bug fixes due to Core Data changes.