Fix match days issues