Matching fixes and improvements.