diff --git a/Spigot-Server-Patches/0490-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0490-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index dcbc1c67e0..1407659fe3 100644
--- a/Spigot-Server-Patches/0490-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/Spigot-Server-Patches/0490-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -13,17 +13,24 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ac01d492872fde6df2b7113005457c714b91fe44..44f431bee68275d48aad75367aaec40a7ca59bea 100644
+index ac01d492872fde6df2b7113005457c714b91fe44..754e2f84526ce9d9eab1a5a4180be643d030b70a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -411,4 +411,10 @@ public class PaperConfig {
+@@ -411,4 +411,17 @@ public class PaperConfig {
      private static void midTickChunkTasks() {
          midTickChunkTasks = getInt("settings.chunk-tasks-per-tick", midTickChunkTasks);
      }
 +
 +    public static boolean allowBlockPermanentBreakingExploits = false;
 +    private static void allowBlockPermanentBreakingExploits() {
-+        allowBlockPermanentBreakingExploits = getBoolean("allow-perm-block-break-exploits", allowBlockPermanentBreakingExploits);
++        if (config.contains("allow-perm-block-break-exploits")) {
++            allowBlockPermanentBreakingExploits = config.getBoolean("allow-perm-block-break-exploits", false);
++            config.set("allow-perm-block-break-exploits", null);
++        }
++
++        config.set("settings.unsupported-settings.allow-permanent-block-break-exploits-readme", "This setting controls if players should be able to break bedrock, end portals and other intended to be permanent blocks.");
++        allowBlockPermanentBreakingExploits = getBoolean("settings.unsupported-settings.allow-permanent-block-break-exploits", allowBlockPermanentBreakingExploits);
++
 +    }
 +
  }
diff --git a/Spigot-Server-Patches/0495-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0495-Add-option-for-console-having-all-permissions.patch
index 42c9b660a1..f04a091b9c 100644
--- a/Spigot-Server-Patches/0495-Add-option-for-console-having-all-permissions.patch
+++ b/Spigot-Server-Patches/0495-Add-option-for-console-having-all-permissions.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Add option for console having all permissions
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 44f431bee68275d48aad75367aaec40a7ca59bea..06adb1fa670e7d755560abae67d46447d63370f0 100644
+index 754e2f84526ce9d9eab1a5a4180be643d030b70a..353f453dba9603a45f7dd53d07f0da441331190a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -417,4 +417,9 @@ public class PaperConfig {
-         allowBlockPermanentBreakingExploits = getBoolean("allow-perm-block-break-exploits", allowBlockPermanentBreakingExploits);
+@@ -424,4 +424,9 @@ public class PaperConfig {
+ 
      }
  
 +    public static boolean consoleHasAllPermissions = false;
diff --git a/Spigot-Server-Patches/0510-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0510-Fix-piston-physics-inconsistency-MC-188840.patch
index 33fa3d9944..ba9ffb6bd8 100644
--- a/Spigot-Server-Patches/0510-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/Spigot-Server-Patches/0510-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -32,15 +32,16 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 06adb1fa670e7d755560abae67d46447d63370f0..3b0f3127bcee8e9290b4640bcd4ec0d17fb43f43 100644
+index 353f453dba9603a45f7dd53d07f0da441331190a..741c06a27e664211a7023a6369f8e69cbb41a321 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -422,4 +422,9 @@ public class PaperConfig {
+@@ -429,4 +429,10 @@ public class PaperConfig {
          consoleHasAllPermissions = getBoolean("settings.console-has-all-permissions", consoleHasAllPermissions);
      }
  
 +    public static boolean allowPistonDuplication;
 +    private static void allowPistonDuplication() {
++        config.set("settings.unsupported-settings.allow-piston-duplication-readme", "This setting controls if player should be able to use TNT duplication, but this also allows duplicating carpet, rails and potentially other items");
 +        allowPistonDuplication = getBoolean("settings.unsupported-settings.allow-piston-duplication", config.getBoolean("settings.unsupported-settings.allow-tnt-duplication", false));
 +        set("settings.unsupported-settings.allow-tnt-duplication", null);
 +    }