SC#QCADOOMES-1615 Some fixes in production counting.