diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinPlayerMoveC2SPacket.java b/src/main/java/com/minelittlepony/client/mixin/MixinPlayerMoveC2SPacket.java
index 630cf92d..e3d2c29a 100644
--- a/src/main/java/com/minelittlepony/client/mixin/MixinPlayerMoveC2SPacket.java
+++ b/src/main/java/com/minelittlepony/client/mixin/MixinPlayerMoveC2SPacket.java
@@ -22,8 +22,7 @@ abstract class MixinPlayerMoveC2SPacket implements Packet<ServerPlayPacketListen
     @Shadow @Final
     protected boolean changeLook;
 
-    @Inject(method = "<init>(DDDFFZZZ)V",
-            at = @At("RETURN"))
+    @Inject(method = "<init>(DDDFFZZZZ)V", at = @At("RETURN"))
     private void onInit(CallbackInfo info) {
         if (changeLook) {
             pitch = HorseCam.transformCameraAngle(pitch);
diff --git a/src/main/java/com/minelittlepony/client/render/entity/PonyStandRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/PonyStandRenderer.java
index 30c8e534..74443cc3 100644
--- a/src/main/java/com/minelittlepony/client/render/entity/PonyStandRenderer.java
+++ b/src/main/java/com/minelittlepony/client/render/entity/PonyStandRenderer.java
@@ -123,7 +123,7 @@ public class PonyStandRenderer extends LivingEntityRenderer<ArmorStandEntity, Po
                 FeatureRendererContext<PonyRenderState, EarthPonyModel<PonyRenderState>>,
                 PonyRenderContext<ArmorStandEntity, PonyRenderState, EarthPonyModel<PonyRenderState>> {
         private final EquineRenderManager<ArmorStandEntity, PonyRenderState, EarthPonyModel<PonyRenderState>> manager
-            = new EquineRenderManager<>(this, (state, stack, progress, yaw) -> {}, ModelType.EARTH_PONY.create(false));
+            = new EquineRenderManager<ArmorStandEntity, PonyRenderState, EarthPonyModel<PonyRenderState>>(this, (state, stack, progress, yaw) -> {}, ModelType.EARTH_PONY.create(false));
 
         @Override
         public Pony getEntityPony(ArmorStandEntity entity) {
diff --git a/src/main/java/com/minelittlepony/client/render/entity/SkeleponyRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/SkeleponyRenderer.java
index 93433a0c..609a5361 100644
--- a/src/main/java/com/minelittlepony/client/render/entity/SkeleponyRenderer.java
+++ b/src/main/java/com/minelittlepony/client/render/entity/SkeleponyRenderer.java
@@ -46,7 +46,7 @@ public class SkeleponyRenderer<T extends AbstractSkeletonEntity, S extends Skele
 
     public static SkeleponyRenderer<StrayEntity, State> stray(EntityRendererFactory.Context context) {
         return PonyRenderer.appendFeature(new SkeleponyRenderer<StrayEntity, State>(context, STRAY, 1), ctx -> {
-            return new ClothingFeature<>(ctx, ModelType.SKELETON_CLOTHES, STRAY_SKELETON_OVERLAY);
+            return new ClothingFeature<State, SkeleponyModel<State>>(ctx, ModelType.SKELETON_CLOTHES, STRAY_SKELETON_OVERLAY);
         });
     }
 
@@ -57,7 +57,7 @@ public class SkeleponyRenderer<T extends AbstractSkeletonEntity, S extends Skele
                 return new BoggedState();
             }
         }, ctx -> {
-            return new ClothingFeature<>(ctx, ModelType.SKELETON_CLOTHES, BOGGED_SKELETON_OVERLAY);
+            return new ClothingFeature<BoggedState, SkeleponyModel<BoggedState>>(ctx, ModelType.SKELETON_CLOTHES, BOGGED_SKELETON_OVERLAY);
         }), BoggedMushroomsFeature::new);
     }
 
diff --git a/src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java
index e5eba545..f0182d68 100644
--- a/src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java
+++ b/src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java
@@ -5,6 +5,7 @@ import com.minelittlepony.api.model.PonyModel;
 import com.minelittlepony.api.pony.Pony;
 import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.client.model.ModelType;
+import com.minelittlepony.client.model.entity.IllagerPonyModel;
 import com.minelittlepony.client.model.entity.race.AlicornModel;
 import com.minelittlepony.client.render.entity.npc.textures.TextureSupplier;
 import com.minelittlepony.client.render.entity.state.PonyRenderState;
@@ -51,11 +52,11 @@ public class IllagerPonyRenderer<
     }
 
     public static IllagerPonyRenderer<VindicatorEntity, ?, ?> vindicator(EntityRendererFactory.Context context) {
-        return new IllagerPonyRenderer<>(context, (ModelKey<?>)ModelType.ILLAGER, VINDICATOR);
+        return new IllagerPonyRenderer<VindicatorEntity, State, IllagerPonyModel<State>>(context, ModelType.ILLAGER, VINDICATOR);
     }
 
     public static IllagerPonyRenderer<EvokerEntity, ?, ?> evoker(EntityRendererFactory.Context context) {
-        return new IllagerPonyRenderer<>(context, (ModelKey<?>)ModelType.ILLAGER, EVOKER);
+        return new IllagerPonyRenderer<EvokerEntity, State, IllagerPonyModel<State>>(context,ModelType.ILLAGER, EVOKER);
     }
 
     public static class State extends PonyRenderState {