More index tweaks. Meh.