More index fixes...