Continued improving build scripts