Fixes to Core Data integration bugs.