I have fixed some of these. I can fix others manually, and after the update (not the demo) is out, I can take a look at automating the fix. The problem is the step I ran last week to fix rescan packages was also doing some duplicate cleanup, and that cleanup had some issues where it could break...