Trying to fix uuid bugs

bug fixes