More changes for build

More changes for build