Architecture build script updates.