more mask fixes