A few changes in build script