Added changes to build scripts