Fix issues with incorrect paths getting hardcoded into the binaries, and
missing binaries. Bumped to release -2