Mask mode fixes. See #837