Tweak build scripts