diff --git a/paper-server/pom.xml b/paper-server/pom.xml
index 8b22a1ccc8..8139fbfae2 100644
--- a/paper-server/pom.xml
+++ b/paper-server/pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.bukkit</groupId>
   <artifactId>craftbukkit</artifactId>
   <packaging>jar</packaging>
-  <version>1.6.1-R0.1-SNAPSHOT</version>
+  <version>1.6.2-R0.1-SNAPSHOT</version>
   <name>CraftBukkit</name>
   <url>http://www.bukkit.org</url>
 
@@ -12,8 +12,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <api.version>unknown</api.version>
     <junit.version>4.11</junit.version>
-    <minecraft.version>1.6.1</minecraft.version>
-    <minecraft_version>1_6_R1</minecraft_version>
+    <minecraft.version>1.6.2</minecraft.version>
+    <minecraft_version>1_6_R2</minecraft_version>
   </properties>
 
   <scm>
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 1d52866e3c..3db1b2237d 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -90,7 +90,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
     public void setMaxHealth(double amount) {
         Validate.isTrue(amount > 0, "Max health must be greater than 0");
 
-        getHandle().a(GenericAttributes.a).a(amount);
+        getHandle().getAttributeInstance(GenericAttributes.a).setValue(amount);
 
         if (getHealth() > amount) {
             setHealth(amount);
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java b/paper-server/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
index 900dc7d2c0..b59d142a3f 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
@@ -64,6 +64,12 @@ public class CraftPotionEffectType extends PotionEffectType {
             return "POISON";
         case 20:
             return "WITHER";
+        case 21:
+            return "HEALTH_BOOST";
+        case 22:
+            return "ABSORPTION";
+        case 23:
+            return "SATURATION";
         default:
             return "UNKNOWN_EFFECT_TYPE_" + handle.id;
         }