Fixed incorrect UUID comparisons