diff --git a/package.json b/package.json
index 414759f..6dfee1b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@intelcorp/wmi-native-module",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "WMI Native Module",
   "main": "index.js",
   "repository": {
@@ -11,7 +11,7 @@
   "contributors": [],
   "license": "MIT",
   "dependencies": {
-    "node-addon-api": "^8.2.1"
+    "node-addon-api": "^8.5.0"
   },
   "scripts": {
     "install": "node-gyp rebuild"
diff --git a/src/wmi_wrapper.cpp b/src/wmi_wrapper.cpp
index 95a9167..3b414f2 100644
--- a/src/wmi_wrapper.cpp
+++ b/src/wmi_wrapper.cpp
@@ -64,7 +64,7 @@ namespace wmi_wrapper
     }
 
     std::wstring GetPropertyValue(
-        std::wstring property,
+        const std::wstring &property,
         IWbemClassObject *class_object)
     {
         HRESULT hres;
@@ -148,7 +148,7 @@ namespace wmi_wrapper
     }
 
     HRESULT GetAllValues(
-        std::wstring query,
+        const std::wstring &query,
         std::vector<std::wstring> properties,
         std::vector<WmiQueryResult> *results,
         IWbemServices *service)
@@ -223,11 +223,11 @@ namespace wmi_wrapper
         // Initialize COM.
         hres = CoInitializeEx(0, COINIT_MULTITHREADED);
         {
-	    if (FAILED(hres) && hres == RPC_E_CHANGED_MODE)
-	    {
-		// Was already initialized in a different mode, switch
-		hres = CoInitializeEx(0, COINIT_APARTMENTTHREADED);
-	    }
+            if (FAILED(hres) && hres == RPC_E_CHANGED_MODE)
+            {
+                // Was already initialized in a different mode, switch
+                hres = CoInitializeEx(0, COINIT_APARTMENTTHREADED);
+            }
             if (FAILED(hres))
             {
                 // Failed to initialize COM library
diff --git a/src/wmi_wrapper.h b/src/wmi_wrapper.h
index af93799..a50b974 100644
--- a/src/wmi_wrapper.h
+++ b/src/wmi_wrapper.h
@@ -34,8 +34,8 @@ namespace wmi_wrapper
     typedef std::vector<std::pair<std::wstring, std::wstring>> WmiQueryResult;
     typedef std::pair<std::wstring, std::vector<std::wstring>> WmiQueryParams;
 
-    std::wstring GetPropertyValue(std::wstring property, IWbemClassObject *class_object);
-    HRESULT GetAllValues(std::wstring query, std::vector<std::wstring> properties, std::vector<WmiQueryResult> *results, IWbemServices *service);
+    std::wstring GetPropertyValue(const std::wstring &property, IWbemClassObject *class_object);
+    HRESULT GetAllValues(const std::wstring &query, std::vector<std::wstring> properties, std::vector<WmiQueryResult> *results, IWbemServices *service);
     HRESULT GetPropertyValues(std::vector<std::wstring> properties, WmiQueryResult *results, IWbemClassObject *class_object);
     HRESULT GetAllPropertyValues(IWbemClassObject *class_object, WmiQueryResult *results);
     HRESULT Query(const char *wmi_namespace, WmiQueryParams query, std::vector<WmiQueryResult> *results);