Bugfixes when entering new matches