diff --git a/CASA-auth-token/non-java/server/AuthTokenValidate/linux/platform.c b/CASA-auth-token/non-java/server/AuthTokenValidate/linux/platform.c
index b8573a80..ec77a091 100644
--- a/CASA-auth-token/non-java/server/AuthTokenValidate/linux/platform.c
+++ b/CASA-auth-token/non-java/server/AuthTokenValidate/linux/platform.c
@@ -74,7 +74,7 @@ PlatAllocMutex(void)
 //=======================================================================--
 {
    PlatformMutex        *pPlatMutex;
-   pthread_mutexattr_t  mutexAttr = {PTHREAD_MUTEX_RECURSIVE};
+   pthread_mutexattr_t  mutexAttr;
 
    DbgTrace(2, "-PlatAllocMutex- Start\n", 0);
 
@@ -83,7 +83,30 @@ PlatAllocMutex(void)
    if (pPlatMutex)
    {
       // Finish initializing the mutex
-      pthread_mutex_init(&pPlatMutex->mutex, &mutexAttr);
+      if (pthread_mutexattr_init(&mutexAttr) == 0)
+      {
+         if (pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_RECURSIVE) == 0)
+         {
+            if (pthread_mutex_init(&pPlatMutex->mutex, &mutexAttr) != 0)
+            {
+               DbgTrace(0, "-PlatAllocMutex- Error %d initing mutex\n", errno);
+               free(pPlatMutex);
+               pPlatMutex = NULL;
+            }
+         }
+         else
+         {
+            DbgTrace(0, "-PlatAllocMutex- Error %d setting mutex type\n", errno);
+            free(pPlatMutex);
+            pPlatMutex = NULL;
+         }
+      }
+      else
+      {
+         DbgTrace(0, "-PlatAllocMutex- Error %d initing mutexattr\n", errno);
+         free(pPlatMutex);
+         pPlatMutex = NULL;
+      }
    }
    else
    {
@@ -204,10 +227,10 @@ OpenLibrary(
    libHandle = dlopen(pFileName, RTLD_LAZY);
    if (libHandle == NULL)
    {
-      DbgTrace(0, "-OpenLibrary- Not able to load library, error = %d\n", dlerror());
+      DbgTrace(0, "-OpenLibrary- Not able to load library, error = %s\n", dlerror());
    }
 
-   DbgTrace(1, "-OpenLibrary- End, handle = %08X\n", libHandle);
+   DbgTrace(1, "-OpenLibrary- End, handle = %0lX\n", (long) libHandle);
 
    return libHandle;
 }
@@ -261,10 +284,10 @@ GetFunctionPtr(
    pFuncPtr = dlsym(libHandle, pFunctionName);
    if (pFuncPtr == NULL)
    {
-      DbgTrace(0, "-GetFunctionPtr- Not able to obtain func ptr, error = %d\n", dlerror());
+      DbgTrace(0, "-GetFunctionPtr- Not able to obtain func ptr, error = %s\n", dlerror());
    }
 
-   DbgTrace(1, "-GetFunctionPtr- End, pFuncPtr = %08X\n", pFuncPtr);
+   DbgTrace(1, "-GetFunctionPtr- End, pFuncPtr = %0lX\n", (long) pFuncPtr);
 
    return pFuncPtr;
 }
diff --git a/CASA-auth-token/non-java/server/AuthTokenValidate/validate.c b/CASA-auth-token/non-java/server/AuthTokenValidate/validate.c
index 99f7eb76..a40f4c08 100644
--- a/CASA-auth-token/non-java/server/AuthTokenValidate/validate.c
+++ b/CASA-auth-token/non-java/server/AuthTokenValidate/validate.c
@@ -216,7 +216,7 @@ ValidateAuthToken(
                   }
                   else
                   {
-                     DbgTrace(0, "-ValidateAuthToken- Failed to load Ipc library, error = %d\n", dlerror());
+                     DbgTrace(0, "-ValidateAuthToken- Failed to load Ipc library, error = %s\n", dlerror());
                   }
                }
                else