More index fixes