Indexing tweaks