Fixes minor matching bugs.