#10 misc fixes to new build script