Do some work on fixing up ExtractedImage upgrading.