Minor fixes for ETA/progress for Incremental & Mask modes.