diff --git a/src/main/java/com/minelittlepony/client/model/part/PegasusWings.java b/src/main/java/com/minelittlepony/client/model/part/PegasusWings.java
index 6f996ba1..67b3b781 100644
--- a/src/main/java/com/minelittlepony/client/model/part/PegasusWings.java
+++ b/src/main/java/com/minelittlepony/client/model/part/PegasusWings.java
@@ -23,10 +23,9 @@ public class PegasusWings<T extends Model & IPegasus> implements IPart, MsonMode
 
     protected Wing legacyWing;
 
-    @SuppressWarnings("unchecked")
     @Override
     public void init(ModelContext context) {
-        pegasus = (T)context.getModel();
+        pegasus = context.getModel();
         leftWing = context.findByName("left_wing");
         rightWing = context.findByName("right_wing");
         legacyWing = context.findByName("legacy_right_wing");
@@ -92,7 +91,7 @@ public class PegasusWings<T extends Model & IPegasus> implements IPart, MsonMode
 
         @Override
         public void init(ModelContext context) {
-            pegasus = (IPegasus)context.getModel();
+            pegasus = context.getModel();
             extended = context.findByName("extended");
             folded = context.findByName("folded");
         }
diff --git a/src/main/java/com/minelittlepony/client/model/part/PonySnout.java b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java
index 8886eafc..c425b6d0 100644
--- a/src/main/java/com/minelittlepony/client/model/part/PonySnout.java
+++ b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java
@@ -23,10 +23,9 @@ public class PonySnout implements IPart, MsonModel {
 
     private ICapitated<ModelPart> head;
 
-    @SuppressWarnings("unchecked")
     @Override
     public void init(ModelContext context) {
-        head = (ICapitated<ModelPart>)context.getModel();
+        head = context.getModel();
         mare = context.findByName("mare");
         stallion = context.findByName("stallion");
     }
diff --git a/src/main/java/com/minelittlepony/client/model/part/PonyTail.java b/src/main/java/com/minelittlepony/client/model/part/PonyTail.java
index 78a77c96..6e14d144 100644
--- a/src/main/java/com/minelittlepony/client/model/part/PonyTail.java
+++ b/src/main/java/com/minelittlepony/client/model/part/PonyTail.java
@@ -22,15 +22,17 @@ public class PonyTail implements IPart, MsonModel {
 
     @Override
     public void init(ModelContext context) {
-        theModel = (AbstractPonyModel<?>)context.getModel();
+        theModel = context.getModel();
 
         tail = new ModelPart(theModel);
 
         try {
             int segments = context.getLocals().getValue("segments").get().intValue();
 
+            ModelContext subContext = context.resolve(this);
+
             for (int i = 0; i < segments; i++) {
-                Segment segment = context.findByName("segment_" + i);
+                Segment segment = subContext.findByName("segment_" + i);
                 segment.index = i;
                 tail.addChild(segment);
             }
diff --git a/src/main/java/com/minelittlepony/client/model/part/SeaponyTail.java b/src/main/java/com/minelittlepony/client/model/part/SeaponyTail.java
index e0da737b..c30736cd 100644
--- a/src/main/java/com/minelittlepony/client/model/part/SeaponyTail.java
+++ b/src/main/java/com/minelittlepony/client/model/part/SeaponyTail.java
@@ -25,7 +25,7 @@ public class SeaponyTail implements IPart, MsonModel {
 
     @Override
     public void init(ModelContext context) {
-        model = (IPonyModel<?>)context.getModel();
+        model = context.getModel();
         tailBase = context.findByName("base");
         tailTip = context.findByName("tip");
         tailFins = context.findByName("fins");