More invalid index fixes