Minor indexing bugfixes