UUID fixes