Fix matching errors