Updating the bootstrap scripts with potential build fixes (hopefully).