Many build script updates