diff --git a/MemoryModule.c b/MemoryModule.c
index cf9f372..1581693 100644
--- a/MemoryModule.c
+++ b/MemoryModule.c
@@ -33,6 +33,10 @@
 #include <windows.h>
 #include <winnt.h>
 #include <stddef.h>
+#ifdef __MINGW32__
+// for mbstowcs_s and wcstombs_s
+#include <stdlib.h>
+#endif
 #include <tchar.h>
 #ifdef DEBUG_OUTPUT
 #include <stdio.h>
@@ -599,7 +603,6 @@ HMEMORYMODULE MemoryLoadLibraryEx(const void *data, size_t size,
     PIMAGE_NT_HEADERS old_header;
     unsigned char *code, *headers;
     ptrdiff_t locationDelta;
-    SYSTEM_INFO sysInfo;
     PIMAGE_SECTION_HEADER section;
     DWORD i;
     size_t optionalSectionSize;
@@ -728,7 +731,7 @@ HMEMORYMODULE MemoryLoadLibraryEx(const void *data, size_t size,
     result->getProcAddress = getProcAddress;
     result->freeLibrary = freeLibrary;
     result->userdata = userdata;
-    result->pageSize = sysInfo.dwPageSize;
+    result->pageSize = old_header->OptionalHeader.SectionAlignment;
 #ifdef _WIN64
     result->blockedMemory = blockedMemory;
 #endif
@@ -806,6 +809,12 @@ HMEMORYMODULE MemoryLoadLibraryEx(const void *data, size_t size,
     return NULL;
 }
 
+LPVOID MemoryGetCodeAddress(HMEMORYMODULE mod)
+{
+    PMEMORYMODULE module = (PMEMORYMODULE)mod;
+    return module ? (LPVOID)module->codeBase : NULL;
+}
+
 static int _compare(const void *a, const void *b)
 {
     const struct ExportNameEntry *p1 = (const struct ExportNameEntry*) a;
@@ -1007,8 +1016,9 @@ static PIMAGE_RESOURCE_DIRECTORY_ENTRY _MemorySearchResourceEntry(
         // using a pre-allocated array.
         wchar_t _searchKeySpace[MAX_LOCAL_KEY_LENGTH+1];
         LPWSTR _searchKey;
+        size_t _searchKeySize;
         if (searchKeyLen > MAX_LOCAL_KEY_LENGTH) {
-            size_t _searchKeySize = (searchKeyLen + 1) * sizeof(wchar_t);
+            _searchKeySize = (searchKeyLen + 1) * sizeof(wchar_t);
             _searchKey = (LPWSTR) malloc(_searchKeySize);
             if (_searchKey == NULL) {
                 SetLastError(ERROR_OUTOFMEMORY);
@@ -1016,10 +1026,10 @@ static PIMAGE_RESOURCE_DIRECTORY_ENTRY _MemorySearchResourceEntry(
             }
         } else {
             _searchKey = &_searchKeySpace[0];
+            _searchKeySize = sizeof(_searchKeySpace);
         }
 
-        mbstowcs(_searchKey, key, searchKeyLen);
-        _searchKey[searchKeyLen] = 0;
+        mbstowcs_s(NULL, _searchKey, _searchKeySize, key, searchKeyLen);
         searchKey = _searchKey;
 #endif
         start = 0;
@@ -1146,7 +1156,7 @@ MemoryLoadStringEx(HMEMORYMODULE module, UINT id, LPTSTR buffer, int maxsize, WO
 {
     HMEMORYRSRC resource;
     PIMAGE_RESOURCE_DIR_STRING_U data;
-    DWORD size;
+    int size;
     if (maxsize == 0) {
         return 0;
     }
@@ -1169,15 +1179,13 @@ MemoryLoadStringEx(HMEMORYMODULE module, UINT id, LPTSTR buffer, int maxsize, WO
     }
 
     size = data->Length;
-    if (size >= (DWORD) maxsize) {
-        size = maxsize;
-    } else {
-        buffer[size] = 0;
+    if (size >= maxsize) {
+        size = maxsize - 1;
     }
 #if defined(UNICODE)
-    wcsncpy(buffer, data->NameString, size);
+    wcsncpy_s(buffer, maxsize, data->NameString, size);
 #else
-    wcstombs(buffer, data->NameString, size);
+    wcstombs_s(NULL, buffer, maxsize, data->NameString, size);
 #endif
     return size;
 }
diff --git a/MemoryModule.h b/MemoryModule.h
index a728f6b..28f8e11 100644
--- a/MemoryModule.h
+++ b/MemoryModule.h
@@ -73,6 +73,12 @@ HMEMORYMODULE MemoryLoadLibraryEx(const void *, size_t,
  */
 FARPROC MemoryGetProcAddress(HMEMORYMODULE, LPCSTR);
 
+/**
+ * Get the code base address of loading module to store it above.
+ * On load dynamic library it used as a handle of library instance.
+ */
+LPVOID MemoryGetCodeAddress(HMEMORYMODULE);
+
 /**
  * Free previously loaded EXE/DLL.
  */