WeightMask fixes