More changes in indexings.