Fix UUID detection