diff --git a/Changelog.txt b/Changelog.txt
index 8f680a5fd..d6875f6c8 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,6 +7,13 @@ Key:
   ! Change
   - Removal
 
+Version 2.1.22
+    Less aggressive spam click protection on Fishing
+    Added all missing flowers to Double Drop tables for Herbalism
+    Fixed Double Drop entries for all farming crops for Herbalism
+    NOTE: You'll need to add these entries to your config.yml manually, or wait for the upcoming config update where this will be fixed for you automatically.
+    NOTE: Here's what your Double_Drop entries in Config.yml for Herbalism should look like: https://paste.gg/p/anonymous/8d8db4ac69bd495fa48a7f5190484c5e
+
 Version 2.1.21
     Improved anti-farm/anti-grinding mechanics for Rolling
     When you gain XP from Rolling there is a cooldown period (60~ seconds) for gaining XP again
diff --git a/pom.xml b/pom.xml
index 70db7329c..8d7168aa9 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.21</version>
+    <version>2.1.22-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
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 61a670599..4c3a5c34b 100644
--- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
@@ -44,7 +44,7 @@ import org.bukkit.util.Vector;
 import java.util.*;
 
 public class FishingManager extends SkillManager {
-    public static final int FISHING_ROD_CAST_CD_MILLISECONDS = 200;
+    public static final int FISHING_ROD_CAST_CD_MILLISECONDS = 100;
     public static final int OVERFISH_LIMIT = 4;
     private final long FISHING_COOLDOWN_SECONDS = 1000L;
 
@@ -74,7 +74,7 @@ public class FishingManager extends SkillManager {
     {
         long currentTime = System.currentTimeMillis();
         //Only track spam casting if the fishing hook is fresh
-        if(currentTime > fishHookSpawnTimestamp + 500)
+        if(currentTime > fishHookSpawnTimestamp + 1000)
             return;
 
         if(currentTime < fishingRodCastTimestamp + FISHING_ROD_CAST_CD_MILLISECONDS)
diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
index 6dc981941..9ad9a96a6 100644
--- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
@@ -262,8 +262,14 @@ public class RepairManager extends SkillManager {
     private short repairCalculate(short durability, int repairAmount) {
         Player player = getPlayer();
 
-        if (Permissions.isSubSkillEnabled(player, SubSkillType.REPAIR_REPAIR_MASTERY) && RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.REPAIR_REPAIR_MASTERY)) {
-            double bonus = repairAmount * Math.min((((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * getSkillLevel()) / 100.0D), Repair.repairMasteryMaxBonus / 100.0D);
+        if (Permissions.isSubSkillEnabled(player, SubSkillType.REPAIR_REPAIR_MASTERY)
+                && RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.REPAIR_REPAIR_MASTERY)) {
+
+            double maxBonusCalc = Repair.repairMasteryMaxBonus / 100.0D;
+            double skillLevelBonusCalc = (Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * (getSkillLevel() / 100.0D);
+            double bonus = repairAmount * Math.min(skillLevelBonusCalc, maxBonusCalc);
+
+
             repairAmount += bonus;
         }
 
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index b528d3784..2c7ea0e87 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -428,22 +428,34 @@ Skills:
 ###
 Double_Drops:
     Herbalism:
-        Beetroots_Ripe: true
+        Beetroots: true
         Brown_Mushroom: true
         Cactus: true
-        Carrots_Ripe: true
-        Cocoa_Ripe: true
-        Wheat_Ripe: true
+        Carrots: true
+        Cocoa: true
+        Wheat: true
         Melon: true
-        Nether_Wart_Ripe: true
-        Potatoes_Ripe: true
+        Nether_Wart: true
+        Potatoes: true
         Pumpkin: true
         Red_Mushroom: true
-        Red_Tulip: true
         Sugar_Cane: true
         Vine: true
         Lily_Pad: true
+        Red_Tulip: true
+        White_Tulip: true
+        Pink_Tulip: true
+        Orange_Tulip: true
         Dandelion: true
+        Poppy: true
+        Blue_Orchid: true
+        Allium: true
+        Azure_Bluet: true
+        Oxeye_Daisy: true
+        Sunflower: true
+        Lilac: true
+        Rose_Bush: true
+        Peony: true
     Mining:
         Coal_Ore: true
         Diamond_Ore: true