Fix global binding and UUIDs