Fixed fallout from refactoring of indexing