More indexing tweaks