More internal (minor) fixes to index+benchmarks