bootstrap code tweaks to handle curl situations