Small build scripts improvement