Minor changes to masking