Couple more fixes to Core Persistence implementation of RelationManager.