Minor changes to allow for building on unix, plus removing the binaries from lib