diff --git a/DFULoader/dfu-util.js b/DFULoader/dfu-util.js
index 79a49442..700a0ad8 100644
--- a/DFULoader/dfu-util.js
+++ b/DFULoader/dfu-util.js
@@ -130,7 +130,7 @@ var device = null;
                 let configValue = device.settings.configuration.configurationValue;
                 if (configDesc.bConfigurationValue == configValue) {
                     for (let desc of configDesc.descriptors) {
-                        if (desc.bDescriptorType == 0x21 && desc.hasOwnProperty("bcdDFUVersion")) {
+                        if (desc.bDescriptorType == 0x21 && Object.prototype.hasOwnProperty.call(desc, "bcdDFUVersion")) {
                             funcDesc = desc;
                             break;
                         }
@@ -543,7 +543,7 @@ var device = null;
                     if (status.state == dfu.dfuERROR) {
                         await device.clearStatus();
                     }
-                } catch (error) {
+                } catch {
                     device.logWarning("Failed to clear status");
                 }
                 await device.do_download(transferSize, firmwareFile, manifestationTolerant).then(
diff --git a/DFULoader/dfuse.js b/DFULoader/dfuse.js
index fef31a79..881050e8 100644
--- a/DFULoader/dfuse.js
+++ b/DFULoader/dfuse.js
@@ -41,11 +41,11 @@ var dfuse = {};
 
         let contiguousSegmentRegex = /\/\s*(0x[0-9a-fA-F]{1,8})\s*\/(\s*[0-9]+\s*\*\s*[0-9]+\s?[ BKM]\s*[abcdefg]\s*,?\s*)+/g;
         let contiguousSegmentMatch;
-        while (contiguousSegmentMatch = contiguousSegmentRegex.exec(segmentString)) {
+        while ((contiguousSegmentMatch = contiguousSegmentRegex.exec(segmentString))) {
             let segmentRegex = /([0-9]+)\s*\*\s*([0-9]+)\s?([ BKM])\s*([abcdefg])\s*,?\s*/g;
             let startAddress = parseInt(contiguousSegmentMatch[1], 16);
             let segmentMatch;
-            while (segmentMatch = segmentRegex.exec(contiguousSegmentMatch[0])) {
+            while ((segmentMatch = segmentRegex.exec(contiguousSegmentMatch[0]))) {
                 let segment = {}
                 let sectorCount = parseInt(segmentMatch[1], 10);
                 let sectorSize = parseInt(segmentMatch[2]) * sectorMultipliers[segmentMatch[3]];
@@ -272,7 +272,7 @@ var dfuse = {};
 
         try {
             await this.poll_until(state => (state == dfu.dfuMANIFEST));
-        } catch (error) {
+        } catch {
 	}
     }
 
diff --git a/eslint-suppressions.json b/eslint-suppressions.json
index d509b65e..989385be 100644
--- a/eslint-suppressions.json
+++ b/eslint-suppressions.json
@@ -43,14 +43,11 @@
     }
   },
   "DFULoader/dfu-util.js": {
-    "no-prototype-builtins": {
-      "count": 1
-    },
     "no-undef": {
       "count": 2
     },
     "no-unused-vars": {
-      "count": 6
+      "count": 5
     },
     "no-useless-assignment": {
       "count": 1
@@ -65,15 +62,9 @@
     }
   },
   "DFULoader/dfuse.js": {
-    "no-cond-assign": {
-      "count": 2
-    },
     "no-undef": {
       "count": 1
     },
-    "no-unused-vars": {
-      "count": 1
-    },
     "no-useless-assignment": {
       "count": 1
     }