More UUID fixes