Fix non-SAGE build
Update FindPackages