New fixes for indexes