Mask mode: Progress reporting fixes. See #837