Improvements in build script