continued s2 index fixes