diff --git a/oceania/entity/Entities.java b/oceania/entity/Entities.java
index 1d20fd5..51e29c4 100644
--- a/oceania/entity/Entities.java
+++ b/oceania/entity/Entities.java
@@ -3,8 +3,10 @@
 import net.minecraft.util.ResourceLocation;
 import oceania.Oceania;
 import oceania.handler.VillageTradeHandler;
+import oceania.util.OUtil;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.VillagerRegistry;
+import cpw.mods.fml.relauncher.Side;
 
 public class Entities 
 {
@@ -20,7 +22,8 @@ public static void initEntities()
 		VILLAGER_OCEANIA_ID = VillagerRegistry.getRegisteredVillagers().size();
 		VillagerRegistry.instance().registerVillagerId(VILLAGER_OCEANIA_ID);
 		// TODO: Post ModJam - Have a custom skin for the villager.
-		VillagerRegistry.instance().registerVillagerSkin(VILLAGER_OCEANIA_ID, new ResourceLocation("textures/entity/villager/smith.png"));
+		if (OUtil.getSide() == Side.CLIENT)
+			VillagerRegistry.instance().registerVillagerSkin(VILLAGER_OCEANIA_ID, new ResourceLocation("textures/entity/villager/smith.png"));
 		VillagerRegistry.instance().registerVillageTradeHandler(VILLAGER_OCEANIA_ID, new VillageTradeHandler());
 	}
 	
diff --git a/oceania/entity/EntitySubmarine.java b/oceania/entity/EntitySubmarine.java
index bfca538..a320135 100644
--- a/oceania/entity/EntitySubmarine.java
+++ b/oceania/entity/EntitySubmarine.java
@@ -88,6 +88,7 @@ public void onUpdate()
 			if (this.riddenByEntity instanceof EntityPlayer)
 			{
 				Minecraft.getMinecraft().gameSettings.gammaSetting = 10.0f;
+				((EntityPlayer) this.riddenByEntity).setAir(300);
 			}
 			else if (this.riddenByEntity == null && this.lastRidingEntity != null)
 			{