Changes to use prebuilt binaries