diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html
index a296387..a16d2b0 100644
--- a/docs/ReleaseNotes.html
+++ b/docs/ReleaseNotes.html
@@ -53,6 +53,10 @@
     	backwards compatible by default.
    	</td>
   </tr>
+  <tr>
+    <td width="13%" valign="top">1793346</td>
+    <td width="87%" valign="top">(M5) Replaced use of deprecated API and removed unused variables.</td>
+  </tr>
   <tr> 
     <td width="13%" valign="top">&nbsp;</td>
     <td width="87%" valign="top">&nbsp;</td>
diff --git a/jni/Dispatch.cpp b/jni/Dispatch.cpp
index 73278b3..285427d 100644
--- a/jni/Dispatch.cpp
+++ b/jni/Dispatch.cpp
@@ -319,7 +319,8 @@ static char* BasicToCharString(const BSTR inBasicString)
     if (charStrSize > 1)
     {
         charString = new char[charStrSize];
-        size_t len = ::wcstombs(charString, inBasicString, charStrSize);
+		size_t convertedSize;
+		::wcstombs_s(&convertedSize, charString, charStrSize, inBasicString, charStrSize);
     }
     else
         charString = ::_strdup("");
diff --git a/jni/SafeArray.cpp b/jni/SafeArray.cpp
index 0f7599a..ee96c0a 100644
--- a/jni/SafeArray.cpp
+++ b/jni/SafeArray.cpp
@@ -1778,7 +1778,6 @@ JNIEXPORT void JNICALL Java_com_jacob_com_SafeArray_getStrings
   long lb, ub;
   SafeArrayGetLBound(sa, 1, &lb); 
   SafeArrayGetUBound(sa, 1, &ub);
-  int num = ub - lb + 1; 
   VARTYPE vt; 
   SafeArrayGetVartype(sa, &vt); 
   if (vt == VT_VARIANT) 
@@ -2162,7 +2161,6 @@ JNIEXPORT void JNICALL Java_com_jacob_com_SafeArray_getBooleans
   long lb, ub;
   SafeArrayGetLBound(sa, 1, &lb);
   SafeArrayGetUBound(sa, 1, &ub);
-  int num = ub - lb + 1;
   VARTYPE vt;
   SafeArrayGetVartype(sa, &vt);
   if (vt == VT_BOOL) {
@@ -2397,7 +2395,6 @@ JNIEXPORT void JNICALL Java_com_jacob_com_SafeArray_getVariants
   long lb, ub;
   SafeArrayGetLBound(sa, 1, &lb); 
   SafeArrayGetUBound(sa, 1, &ub);
-  int num = ub - lb + 1; 
   VARTYPE vt; 
   SafeArrayGetVartype(sa, &vt); 
   if (vt == VT_VARIANT)