Fixed some matching issues