Fixes for matchup example for better compatibility with new Monkey version