Re: PathSearchAndQualify and other shlwapi fixes