Bugfixes (mostly in NewMatch)