fix several mask clearance issues