[FIX] Finish upgrade of React Router