Fix schema generation so UUIDs are unique (again)