More index tweaks...