Fix up all the persistence to create UUIDs
Fix up the remaining UUID generators