Update reindexing to properly handle Wii U