Minor adjustments to prevent core data concurrency assertions.

Assertions arise with '-com.apple.CoreData.ConcurrencyDebug 1' debug argument enabled.
Merge pull request #2096 from ppierson/core_data_concurrency_fixes

Core data concurrency fixes