Add more package finding.
Fixes to compile.