diff --git a/src/client/java/com/minelittlepony/client/pony/Pony.java b/src/client/java/com/minelittlepony/client/pony/Pony.java
index 32eb199a..10c0dbff 100644
--- a/src/client/java/com/minelittlepony/client/pony/Pony.java
+++ b/src/client/java/com/minelittlepony/client/pony/Pony.java
@@ -137,7 +137,7 @@ public class Pony extends Touchable<Pony> implements IPony {
     @Override
     public boolean isFlying(EntityLivingBase entity) {
         return !(entity.onGround
-                || entity.getRidingEntity() != null
+                || entity.isPassenger()
                 || (entity.isOnLadder() && !(entity instanceof EntityPlayer && ((EntityPlayer)entity).abilities.isFlying))
                 || entity.isInWater()
                 || entity.isPlayerSleeping());
diff --git a/src/client/java/com/minelittlepony/client/render/RenderPony.java b/src/client/java/com/minelittlepony/client/render/RenderPony.java
index 79a9e0e8..5228baaf 100644
--- a/src/client/java/com/minelittlepony/client/render/RenderPony.java
+++ b/src/client/java/com/minelittlepony/client/render/RenderPony.java
@@ -62,7 +62,7 @@ public class RenderPony<T extends EntityLivingBase> {
     }
 
     public float getRenderYaw(T entity, float rotationYaw, float partialTicks) {
-        if (entity.getRidingEntity() != null) {
+        if (entity.isPassenger()) {
             Entity mount = entity.getRidingEntity();
             if (mount  instanceof EntityLivingBase) {
                 return MathUtil.interpolateDegress(((EntityLivingBase)mount).prevRenderYawOffset, ((EntityLivingBase)mount).renderYawOffset, partialTicks);
@@ -73,7 +73,7 @@ public class RenderPony<T extends EntityLivingBase> {
     }
 
     protected void translateRider(EntityLivingBase entity, float ticks) {
-        if (entity.getRidingEntity() != null) {
+        if (entity.isPassenger()) {
             Entity ridingEntity = entity.getRidingEntity();
 
             if (ridingEntity instanceof EntityLivingBase) {
@@ -173,7 +173,7 @@ public class RenderPony<T extends EntityLivingBase> {
             y -= 0.25F;
         }
 
-        if (entity.getRidingEntity() != null) {
+        if (entity.isPassenger()) {
             y += entity.getRidingEntity().getEyeHeight();
         }
 
diff --git a/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java b/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java
index 4ffd4f86..20c2e250 100644
--- a/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java
+++ b/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java
@@ -80,7 +80,7 @@ public abstract class RenderPonyMob<T extends EntityLiving> extends RenderLiving
             shadowSize *= 3; // undo vanilla shadow scaling
         }
 
-        if (entity.getRidingEntity() == null) {
+        if (!entity.isPassenger()) {
             GlStateManager.translatef(0, 0, -entity.width / 2); // move us to the center of the shadow
         } else {
             GlStateManager.translated(0, entity.getYOffset(), 0);
diff --git a/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java b/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java
index 88d99762..c83bfd15 100644
--- a/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java
+++ b/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java
@@ -56,7 +56,7 @@ public class RenderPonyPlayer extends RenderPlayer implements IRenderPony<Abstra
     @Override
     public float prepareScale(AbstractClientPlayer player, float ticks) {
 
-        if (player.getRidingEntity() == null && !player.isPlayerSleeping()) {
+        if (!player.isPassenger() && !player.isPlayerSleeping()) {
             float x = player.width/2;
             float y = 0;
 
@@ -77,7 +77,7 @@ public class RenderPonyPlayer extends RenderPlayer implements IRenderPony<Abstra
         renderPony.preRenderCallback(player, ticks);
         shadowSize = renderPony.getShadowScale();
 
-        if (player.getRidingEntity() != null) {
+        if (player.isPassenger()) {
             GlStateManager.translated(0, player.getYOffset(), 0);
         }
     }
@@ -111,7 +111,7 @@ public class RenderPonyPlayer extends RenderPlayer implements IRenderPony<Abstra
 
     @Override
     public void doRenderShadowAndFire(Entity player, double x, double y, double z, float yaw, float ticks) {
-        if (player.getRidingEntity() != null && ((AbstractClientPlayer)player).isPlayerSleeping()) {
+        if (player.isPassenger() && ((AbstractClientPlayer)player).isPlayerSleeping()) {
             super.doRenderShadowAndFire(player, x, y, z, yaw, ticks);
         }
     }
diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java
index 9157e799..5486529c 100644
--- a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java
+++ b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java
@@ -62,7 +62,7 @@ public class LayerHeldPonyItem<T extends EntityLivingBase> extends AbstractPonyL
 
             float left = hand == EnumHandSide.LEFT ? 1 : -1;
 
-            if (entity.getRidingEntity() != null) {
+            if (entity.isPassenger()) {
                 GlStateManager.translatef(left / 10, -0.2F, -0.5F);
             }
 
diff --git a/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java b/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java
index 63abbd64..f9960d54 100644
--- a/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java
+++ b/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java
@@ -338,6 +338,6 @@ public final class HDSkinManager implements IResourceManagerReloadListener {
 
     @Override
     public void onResourceManagerReload(IResourceManager resourceManager) {
-        this.resources.onResourceManagerReload(resourceManager);
+        resources.onResourceManagerReload(resourceManager);
     }
 }