More UUID changes