Merge "lsof fixes."