Merge "Fix PAN bugs."