Some slight index fixes