And more build script updates