index fixes
index fixes