Improved build scripts