A couple more match corrections and fixes.