diff --git a/Changelog.txt b/Changelog.txt
index 2cc673afe..26017d672 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,6 +7,10 @@ Key:
   ! Change
   - Removal
 
+Version 2.1.25
+    Shake now has an upper limit of damage (10) - Will be configurable in 2.2 which is coming in the near future
+    Rank 1 of Catalysis & Concoctions are now available at level 0 by default (update skillranks.yml or delete it to regen a new one)
+
 Version 2.1.24
     Fixed an exploit where you could clone inventories
 
diff --git a/pom.xml b/pom.xml
index 380dafa61..518a5a4f2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.24</version>
+    <version>2.1.25-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
index 03c5ee8fd..55fd3c69d 100644
--- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
@@ -65,18 +65,20 @@ public class BlockListener implements Listener {
             if(is.getAmount() <= 0)
                 continue;
 
-            //Extra Protection
-            if(event.getBlock().getState() instanceof Container)
-                return;
-
             if(event.getBlock().getState().getMetadata(mcMMO.doubleDropKey).size() > 0)
             {
+                //Extra Protection
+                if(event.getBlock().getState() instanceof Container)
+                    return;
                 event.getBlock().getState().removeMetadata(mcMMO.doubleDropKey, plugin);
                 event.getBlock().getState().getWorld().dropItemNaturally(event.getBlockState().getLocation(), is);
             }
 
             else if(event.getBlock().getState().getMetadata(mcMMO.tripleDropKey).size() > 0)
             {
+                //Extra Protection
+                if(event.getBlock().getState() instanceof Container)
+                    return;
                 event.getBlock().getState().removeMetadata(mcMMO.tripleDropKey, plugin);
                 event.getBlock().getState().getWorld().dropItemNaturally(event.getBlockState().getLocation(), is);
                 event.getBlock().getState().getWorld().dropItemNaturally(event.getBlockState().getLocation(), is);
diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
index 381d558a6..17385ad62 100644
--- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
@@ -420,7 +420,7 @@ public class FishingManager extends SkillManager {
             }
 
             Misc.dropItem(target.getLocation(), drop);
-            CombatUtils.dealDamage(target, Math.max(target.getMaxHealth() / 4, 1), EntityDamageEvent.DamageCause.CUSTOM, getPlayer()); // Make it so you can shake a mob no more than 4 times.
+            CombatUtils.dealDamage(target, Math.min(Math.max(target.getMaxHealth() / 4, 1), 10), EntityDamageEvent.DamageCause.CUSTOM, getPlayer()); // Make it so you can shake a mob no more than 4 times.
             applyXpGain(ExperienceConfig.getInstance().getFishingShakeXP(), XPGainReason.PVE);
         }
     }
diff --git a/src/main/resources/skillranks.yml b/src/main/resources/skillranks.yml
index 2a2d0c346..a1422b9fd 100644
--- a/src/main/resources/skillranks.yml
+++ b/src/main/resources/skillranks.yml
@@ -8,12 +8,12 @@
 Alchemy:
     Catalysis:
         Standard:
-            Rank_1: 10
+            Rank_1: 0
         RetroMode:
-            Rank_1: 100
+            Rank_1: 0
     Concoctions:
         Standard:
-            Rank_1: 10
+            Rank_1: 0
             Rank_2: 25
             Rank_3: 35
             Rank_4: 50
@@ -22,7 +22,7 @@ Alchemy:
             Rank_7: 85
             Rank_8: 100
         RetroMode:
-            Rank_1: 100
+            Rank_1: 0
             Rank_2: 250
             Rank_3: 350
             Rank_4: 500