more index fixes