Catch further outdated scrap

Remind me to rebase this together when I'm done