Fix broken upgrade paths.