diff --git a/confluent_client/bin/nodeconfig b/confluent_client/bin/nodeconfig
index 00cafb4f..ba1b861e 100755
--- a/confluent_client/bin/nodeconfig
+++ b/confluent_client/bin/nodeconfig
@@ -242,17 +242,17 @@ async def main():
     session = client.Command()
     rcode = 0
     if options.restoredefault:
-        session.stop_if_noderange_over(noderange, options.maxnodes)
+        await session.stop_if_noderange_over(noderange, options.maxnodes)
         if options.restoredefault.lower() in (
             'sys', 'system', 'uefi', 'bios'):
-            for fr in session.update(
+            async for fr in session.update(
                     '/noderange/{0}/configuration/system/clear'.format(noderange),
                     {'clear': True}):
                 rcode |= client.printerror(fr)
             sys.exit(rcode)
         elif options.restoredefault.lower() in (
             'bmc', 'imm', 'xcc'):
-            for fr in session.update(
+            async for fr in session.update(
                     '/noderange/{0}/configuration/management_controller/clear'.format(noderange),
                     {'clear': True}):
                 rcode |= client.printerror(fr)
diff --git a/confluent_server/confluent/discovery/handlers/xcc.py b/confluent_server/confluent/discovery/handlers/xcc.py
index becfa9b9..925c911e 100644
--- a/confluent_server/confluent/discovery/handlers/xcc.py
+++ b/confluent_server/confluent/discovery/handlers/xcc.py
@@ -662,9 +662,7 @@ class NodeHandler(immhandler.NodeHandler):
                     for currkey in list(statargs):
                         statargs[currkey + attribsuffix] = statargs[currkey]
                         del statargs[currkey]
-                print(repr(statargs))
                 netset, status = await wc.grab_json_response_with_status('/api/dataset', statargs)
-                print(repr(netset))
 
         elif myipaddr.startswith('fe80::'):
             await self.configmanager.set_node_attributes(
diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
index a6f08bd2..7adab480 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
@@ -972,7 +972,7 @@ class IpmiHandler:
 
     async def list_firmware(self):
         await self.output.put(msg.ChildCollection('all'))
-        for id, data in self.ipmicmd.get_firmware():
+        async for id, data in self.ipmicmd.get_firmware():
             await self.output.put(msg.ChildCollection(simplify_name(id)))
 
     async def read_firmware(self, component, category):
@@ -980,7 +980,7 @@ class IpmiHandler:
         errorneeded = False
         try:
             complist = () if component == 'all' else (component,)
-            for id, data in self.ipmicmd.get_firmware(complist, category):
+            async for id, data in self.ipmicmd.get_firmware(complist, category):
                 if (component in ('core', 'all') or
                         component == simplify_name(id) or
                         match_aliases(component, simplify_name(id))):