more build script tweaks