Putting the 'u' back into some of the UUIDs...