diff --git a/common/src/main/java/dev/the_fireplace/lib/command/helpers/ArgumentTypeFactoryImpl.java b/common/src/main/java/dev/the_fireplace/lib/command/helpers/ArgumentTypeFactoryImpl.java
index 0148e77..6dbc1d3 100644
--- a/common/src/main/java/dev/the_fireplace/lib/command/helpers/ArgumentTypeFactoryImpl.java
+++ b/common/src/main/java/dev/the_fireplace/lib/command/helpers/ArgumentTypeFactoryImpl.java
@@ -39,7 +39,7 @@ public <S> CompletableFuture<Suggestions> listOfflinePlayerSuggestions(CommandCo
         if (context.getSource() instanceof SharedSuggestionProvider commandSource) {
             StringReader reader = new StringReader(builder.getInput());
             reader.setCursor(builder.getStart());
-            EntitySelectorParser entitySelectorReader = new EntitySelectorParser(reader);
+            EntitySelectorParser entitySelectorReader = new EntitySelectorParser(reader, true);
 
             try {
                 entitySelectorReader.parse();
diff --git a/common/src/main/java/dev/the_fireplace/lib/command/helpers/OfflinePlayerArgumentParser.java b/common/src/main/java/dev/the_fireplace/lib/command/helpers/OfflinePlayerArgumentParser.java
index ae21d63..7e0668a 100644
--- a/common/src/main/java/dev/the_fireplace/lib/command/helpers/OfflinePlayerArgumentParser.java
+++ b/common/src/main/java/dev/the_fireplace/lib/command/helpers/OfflinePlayerArgumentParser.java
@@ -11,7 +11,7 @@ public final class OfflinePlayerArgumentParser
 {
     public PlayerSelector parse(StringReader reader) throws CommandSyntaxException {
         int startCursor = reader.getCursor();
-        EntitySelectorParser entitySelectorReader = new EntitySelectorParser(reader);
+        EntitySelectorParser entitySelectorReader = new EntitySelectorParser(reader, true);
         EntitySelector entitySelector = entitySelectorReader.parse();
         if (entitySelector.getMaxResults() > 1) {
             reader.setCursor(0);
diff --git a/fabric/build.gradle b/fabric/build.gradle
index fca50e8..c89a60e 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -9,7 +9,7 @@ plugins {
 archivesBaseName = "${archives_base_name}-Fabric"
 def mainArtifactFile = layout.buildDirectory.file("libs/${archivesBaseName}-${version}.jar").get().asFile
 def changelogFile = file('../changelog.txt')
-def supportedMinecraftVersions = [project.minecraft_version, '1.20.5']
+def supportedMinecraftVersions = [project.minecraft_version]
 
 sourceSets {
     api {
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 03f14d0..4b1ddf8 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -39,7 +39,7 @@
   "depends": {
       "fabricloader": ">=0.12.0",
       "fabric": "*",
-      "minecraft": ">=1.21 <1.22",
+      "minecraft": ">=1.21.1 <1.22",
       "annotateddi": ">=4 <5"
   },
 
diff --git a/gradle.properties b/gradle.properties
index 5ec0925..a8256aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,14 +3,14 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 # Common
-minecraft_version=1.21
+minecraft_version=1.21.1
 # Common Dependencies
 annotateddi_version=4.0.4+1.21.1
 # Fabric
 fabric_loader_version=0.16.7
 fabric_curseforge_url=https://www.curseforge.com/minecraft/mc-mods/fireplace-lib
 # Fabric Dependencies
-fabric_api_version=0.102.0+1.21
+fabric_api_version=0.106.0+1.21.1
 fabric_clothconfig_version=15.0.140
 modmenu_version=11.0.3
 # Mod Properties