some index fixes