Various index tweaks