FindOrBuildPackage: Fix packages always being built
Cleanup