mask fixes