Fixing Jazzcat regression, and make unblockify pass on sauce