diff --git a/src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java b/src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java
index 2c681394b..403a45c9e 100644
--- a/src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java
+++ b/src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java
@@ -44,9 +44,9 @@ public class StartupWarningGUI extends GuiScreen
         //TODO: buttonList
         this.buttonList.clear();
         //TODO: buttonList
-        this.buttonList.add(new GuiButton(0, this.width / 2 - 175, this.height - 48, 350, 20, I18n.getStringParams("OK")));
+        this.buttonList.add(new GuiButton(0, this.width / 2 - 175, this.height - 48, 350, 20, I18n.format("OK")));
         //TODO: buttonList
-        this.buttonList.add(new GuiButton(1, this.width / 2 - 175, this.height - 24, 350, 20, I18n.getStringParams("Cancel")));
+        this.buttonList.add(new GuiButton(1, this.width / 2 - 175, this.height - 24, 350, 20, I18n.format("Cancel")));
     }
 
     @Override
diff --git a/src/main/java/biomesoplenty/common/eventhandler/entity/FlippersEventHandler.java b/src/main/java/biomesoplenty/common/eventhandler/entity/FlippersEventHandler.java
index 368ce96e6..8228a482a 100644
--- a/src/main/java/biomesoplenty/common/eventhandler/entity/FlippersEventHandler.java
+++ b/src/main/java/biomesoplenty/common/eventhandler/entity/FlippersEventHandler.java
@@ -17,7 +17,7 @@ public class FlippersEventHandler
 		{
 			EntityLiving entity = (EntityLiving)event.entity;
 
-			ItemStack itemstack = entity.getCurrentItemOrArmor(1);
+			ItemStack itemstack = entity.getEquipmentInSlot(1);
 
 			if (entity.isInWater())
 			{