Some changes to build scripts