More UUID improvements