Tweaks to bamboo build.