Some more improvements needed for converting some recent packages.