More build script updates