diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
index abbfca21..2aa77487 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
@@ -160,8 +160,12 @@ public void onEntityDeath(EntityDeathEvent event) {
         if (wcfg.disableExpDrops) {
             event.setDroppedExp(0);
         }
-        if (event instanceof PlayerDeathEvent && wcfg.disableDeathMessages) {
-            ((PlayerDeathEvent) event).setDeathMessage("");
+        try {
+            if (event instanceof PlayerDeathEvent && wcfg.disableDeathMessages) {
+                ((PlayerDeathEvent) event).setDeathMessage("");
+            }
+        } catch (Throwable t) {
+            // old CraftBukkit, eat it
         }
     }
 
diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java
index 5a318c6e..97fc51e0 100644
--- a/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java
+++ b/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java
@@ -84,11 +84,12 @@ public final class DefaultFlag {
     public static final Flag<?>[] flagsList = new Flag<?>[] {
         PASSTHROUGH, BUILD, PVP, CHEST_ACCESS, PISTONS,
         TNT, LIGHTER, USE, PLACE_VEHICLE, SLEEP,
-        MOB_DAMAGE, MOB_SPAWNING, DENY_SPAWN,
+        MOB_DAMAGE, MOB_SPAWNING, DENY_SPAWN, INVINCIBILITY,
         CREEPER_EXPLOSION, GHAST_FIREBALL, ENDER_BUILD,
         GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_ENTER, NOTIFY_LEAVE,
         EXIT, EXIT_PERM, ENTRY, ENTRY_PERM,
-        HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL, INVINCIBILITY,
+        HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL,
+        FEED_DELAY, FEED_AMOUNT, MIN_FOOD, MAX_FOOD,
         SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT,
         MUSHROOMS, LEAF_DECAY, GRASS_SPREAD,
         FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,