more fixes to index corruption detection