Improve finding correct binaries and install