Fixed some more bugs related to tentative matches.