diff --git a/CASA-auth-token/client/library/engine.c b/CASA-auth-token/client/library/engine.c
index 8322e7b4..573e55dd 100644
--- a/CASA-auth-token/client/library/engine.c
+++ b/CASA-auth-token/client/library/engine.c
@@ -661,8 +661,8 @@ ObtainAuthTokenInt(
       bool setupHostEntries = true;
       char *pHostNameAnd443 = NULL;
       char *pHostNameAnd2645 = NULL;
-      ATSHostEntry serviceHostEntry443 = {};
-      ATSHostEntry serviceHostEntry2645 = {};
+      ATSHostEntry serviceHostEntry443 = {NULL, NULL, NULL, NULL, 0};
+      ATSHostEntry serviceHostEntry2645 = {NULL, NULL, NULL, NULL, 0};
       LIST_ENTRY *pListEntry;
       ATSHostEntry *pHostEntryInUse;
 
@@ -1050,10 +1050,12 @@ CreateATSHostEntry(
 // L2
 //=======================================================================--
 {
+   ATSHostEntry   *pHostEntry;
+
    DbgTrace(1, "-CreateATSHostEntry- Start\n", 0);
 
    // Create host entry
-   ATSHostEntry   *pHostEntry = malloc(sizeof(ATSHostEntry));
+   pHostEntry = malloc(sizeof(ATSHostEntry));
    if (pHostEntry != NULL)
    {
       // Allocate buffers to keep copies of the strings provided
diff --git a/CASA-auth-token/client/library/windows/platform.h b/CASA-auth-token/client/library/windows/platform.h
index efb7b29f..5dc8b8ff 100644
--- a/CASA-auth-token/client/library/windows/platform.h
+++ b/CASA-auth-token/client/library/windows/platform.h
@@ -100,6 +100,8 @@ typedef struct _RpcSession
 #define AcquireModuleMutex    WaitForSingleObjectEx(g_hModuleMutex, INFINITE, FALSE)
 #define ReleaseModuleMutex    ReleaseMutex(g_hModuleMutex)
 
+#define strtok_r strtok_s
+
 //===[ Inlines functions   ]===============================================
 
 //===[ Function prototypes ]===============================================