Various bug fixes for object store migration.