Minor matching fixes.