diff --git a/src/main/java/com/denizenscript/denizencore/scripts/ScriptRegistry.java b/src/main/java/com/denizenscript/denizencore/scripts/ScriptRegistry.java
index 21c62740..7ead4672 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/ScriptRegistry.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/ScriptRegistry.java
@@ -114,7 +114,7 @@ public static <T extends ScriptContainer> T getScriptContainerAs(String name, Cl
         try {
             ScriptContainer container = scriptContainers.get(CoreUtilities.toLowerCase(name));
             if (container != null) {
-                return type.cast(container);
+                return (T) container;
             }
             else {
                 return null;
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/CommandRegistry.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/CommandRegistry.java
index 364a59a0..3d259fae 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/CommandRegistry.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/CommandRegistry.java
@@ -35,7 +35,7 @@ public AbstractCommand get(String commandName) {
     public <T extends AbstractCommand> T get(Class<T> clazz) {
         String command = classes.get(clazz);
         if (command != null) {
-            return clazz.cast(instances.get(command));
+            return (T) instances.get(command);
         }
         else {
             return null;
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/containers/core/CustomScriptContainer.java b/src/main/java/com/denizenscript/denizencore/scripts/containers/core/CustomScriptContainer.java
index a7e4bfb4..a4424d00 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/containers/core/CustomScriptContainer.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/containers/core/CustomScriptContainer.java
@@ -136,7 +136,7 @@ public ListTag runTagScript(String path, ObjectTag val, CustomObjectTag obj, Scr
                 return queue.determinations;
             }
             Debug.echoDebug(this, "[CustomObject] Grabbing parent of " + csc.getName());
-            csc = ScriptRegistry.getScriptContainerAs(csc.inherit, CustomScriptContainer.class);
+            csc = ScriptRegistry.getScriptContainer(csc.inherit);
         }
         Debug.echoDebug(this, "Unable to find tag handler for " + path + " for " + this.getName());
         return null;
@@ -156,7 +156,7 @@ public ListTag runMechScript(String path, CustomObjectTag obj, ObjectTag value)
                 queue.start();
                 return queue.determinations;
             }
-            csc = ScriptRegistry.getScriptContainerAs(csc.inherit, CustomScriptContainer.class);
+            csc = ScriptRegistry.getScriptContainer(csc.inherit);
         }
         return null;
     }