Build-process improvements