More build script modifications