Fix mas fixes