Fix multiple issues preventing correct recording of match results