Build-script modifications