More index tweaks