SC#QCADOOMES-1779 Some fixes in production counting.