Changes from final indexing.