Fixes before branching.
fix MATCH_NUMBER not being forced to set in ‘episodes’ mode.