More changes, fixing the UUID problem.