Minor adjustments on the index