Some uuid changes

Fixed a few bugs saving uuids