diff --git a/src/main/java/com/minelittlepony/unicopia/advancement/CustomEventCriterion.java b/src/main/java/com/minelittlepony/unicopia/advancement/CustomEventCriterion.java
index 4105b13b..98a3a930 100644
--- a/src/main/java/com/minelittlepony/unicopia/advancement/CustomEventCriterion.java
+++ b/src/main/java/com/minelittlepony/unicopia/advancement/CustomEventCriterion.java
@@ -94,11 +94,13 @@ public class CustomEventCriterion extends AbstractCriterion<CustomEventCriterion
         public JsonObject toJson(AdvancementEntityPredicateSerializer serializer) {
             JsonObject json = super.toJson(serializer);
             json.addProperty("event", event);
-            json.add("race", races.toJson());
+            if (!races.isEmpty()) {
+                json.add("race", races.toJson());
+            }
             if (flying != null) {
                 json.addProperty("flying", flying);
             }
-            if (repeatCount > 0) {
+            if (repeatCount > 1) {
                 json.addProperty("repeats", repeatCount);
             }
             return json;
diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/AdvancementDisplayBuilder.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/AdvancementDisplayBuilder.java
index 3043a8bb..40f5d832 100644
--- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/AdvancementDisplayBuilder.java
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/AdvancementDisplayBuilder.java
@@ -97,7 +97,7 @@ public class AdvancementDisplayBuilder {
     }
 
     public AdvancementDisplayBuilder parent(Identifier parent) {
-        advancementBuilder.parent(parent);
+        advancementBuilder.parent(Advancement.Builder.createUntelemetered().build(parent));
         return this;
     }