Updates for uuid2