Some wrdata_mask changes