More index optimizations