Final index fixes (working state)