Improved tools build scripts