Some adjustments to RealMatchProducer