Fix up more issues with image upgrading.