More build script fiddling