Minor uuid tidy issues