ETA/progress fixes for incremental and mask modes when we are doing
more than one node's part of workload.