Some minor updates on the indexing