diff --git a/.pylintrc b/.pylintrc
index 62bb79bf5..1ca22732e 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -281,7 +281,8 @@ disable=import-outside-toplevel,
         comprehension-escape,
         not-callable,
         raise-missing-from,
-        super-with-arguments
+        super-with-arguments,
+        consider-using-dict-items,
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
diff --git a/azext_iot/common/certops.py b/azext_iot/common/certops.py
index 7997f65a1..fef3d146e 100644
--- a/azext_iot/common/certops.py
+++ b/azext_iot/common/certops.py
@@ -48,10 +48,12 @@ def create_self_signed_certificate(subject, valid_days, cert_output_dir, cert_on
         cert_file = subject + '-cert.pem'
         key_file = subject + '-key.pem'
 
-        open(join(cert_output_dir, cert_file), "wt").write(cert_dump)
+        with open(join(cert_output_dir, cert_file), "wt") as f:
+            f.write(cert_dump)
 
         if not cert_only:
-            open(join(cert_output_dir, key_file), "wt").write(key_dump)
+            with open(join(cert_output_dir, key_file), "wt") as f:
+                f.write(key_dump)
 
     result = {
         'certificate': cert_dump,
diff --git a/azext_iot/operations/hub.py b/azext_iot/operations/hub.py
index bbc56b261..9d409f445 100644
--- a/azext_iot/operations/hub.py
+++ b/azext_iot/operations/hub.py
@@ -2178,7 +2178,7 @@ def _iot_device_send_message(
     target, device_id, data, properties=None, msg_count=1, qos=1
 ):
     from azext_iot.operations._mqtt import build_mqtt_device_username
-    import paho.mqtt.publish as publish
+    from paho.mqtt import publish
     from paho.mqtt import client as mqtt
     import ssl
     import os