Fix some of the tiger indexing steps.