diff --git a/ansible_mitogen/mixins.py b/ansible_mitogen/mixins.py
index cebda09c..14c543eb 100644
--- a/ansible_mitogen/mixins.py
+++ b/ansible_mitogen/mixins.py
@@ -120,7 +120,7 @@ class ActionModuleMixin(ansible.plugins.action.ActionBase):
         self._update_module_args(module_name, module_args, task_vars)
 
         # replaces 110 lines
-        js = self._connection.call(
+        js = self.call(
             ansible_mitogen.helpers.run_module,
             get_command_module_name(module_name),
             args=cast(module_args)
diff --git a/ansible_mitogen/strategy/mitogen.py b/ansible_mitogen/strategy/mitogen.py
index 35777e2f..c1f85d05 100644
--- a/ansible_mitogen/strategy/mitogen.py
+++ b/ansible_mitogen/strategy/mitogen.py
@@ -54,7 +54,9 @@ def wrap_action_loader__get(name, *args, **kwargs):
     if klass:
         wrapped_name = 'MitogenActionModule_' + name
         bases = (ansible_mitogen.mixins.ActionModuleMixin, klass)
-        adorned_klass = type(name, bases, {})
+        adorned_klass = type(str(name), bases, {})
+        if kwargs.get('class_only'):
+            return adorned_klass
         return adorned_klass(*args, **kwargs)
 
 action_loader__get = ansible.plugins.action_loader.get