Update FindPackages
Code cosmetics
Fix wrong early-out