A couple of fixes for presupplying an original and matcher