Fixes to CorePersistenceIT and index impl.