More fixes for pcre finding.