diff --git a/src/models/batch.py b/src/models/batch.py
index 093ef45..4f95e91 100644
--- a/src/models/batch.py
+++ b/src/models/batch.py
@@ -1,4 +1,5 @@
 
+import re
 from sqlalchemy import Column, String
 
 from database import Base
@@ -26,6 +27,11 @@ def command(self):
         var_map = map(lambda v: '='.join([v.key, v.value]), var_models)
         var_str = ' && '.join(var_map)
         cmd = self.config_model.command()
+        # replace any instances of the variable in cmd with the lowercase
+        for variable in [var_model.key for var_model in var_models]:
+            matches = re.findall(variable, cmd, re.IGNORECASE)
+            for match in matches:
+                cmd = re.sub(match, variable, cmd)
         if var_str: cmd = ' && '.join([var_str, cmd])
         return cmd
 
diff --git a/src/models/config.py b/src/models/config.py
index 6b85a02..c3cd82f 100644
--- a/src/models/config.py
+++ b/src/models/config.py
@@ -51,7 +51,8 @@ def help(self):
         return self.data['help']
 
     def args(self):
-        return self.arguments or []
+        if self.arguments: return [str(a).lower() for a in self.arguments]
+        else: return []
 
     # TODO: Deprecated, avoid usage
     def interactive_only(self):