New build script and adjustments for it