Update to use Patch.patchAs
Update to use new recover matching methods