smurf: More fixes to support mask freezing in skyloop