index fixes