diff --git a/CASA-auth-token/server/AuthTokenValidate/validate.c b/CASA-auth-token/server/AuthTokenValidate/validate.c
index 81d695ba..fe541ec9 100644
--- a/CASA-auth-token/server/AuthTokenValidate/validate.c
+++ b/CASA-auth-token/server/AuthTokenValidate/validate.c
@@ -179,13 +179,17 @@ ValidateAuthToken(
                         IdenTokenUninit();
                         PrincipalIfUninit();
                         ConfigIfUninit();
+
+                        retStatus = CasaStatusBuild(CASA_SEVERITY_ERROR,
+                                                    CASA_FACILITY_AUTHTOKEN,
+                                                    CASA_STATUS_UNSUCCESSFUL);
                      }
                      else
                      {
                         if ((g_ipcInitPtr)("CASA_AuthTokenValidate",
                                            g_multiThreadedApplication,
                                            DebugLevel,
-                                           false) == 0)
+                                           true) == 0)
                         {
                            // Open endpoint for the Authentication Token Validation Service
                            //if ((g_ipcOpenEndPointPtr)(5000,
@@ -206,6 +210,10 @@ ValidateAuthToken(
                               IdenTokenUninit();
                               PrincipalIfUninit();
                               ConfigIfUninit();
+
+                              retStatus = CasaStatusBuild(CASA_SEVERITY_ERROR,
+                                                          CASA_FACILITY_AUTHTOKEN,
+                                                          CASA_STATUS_UNSUCCESSFUL);
                            }
                         }
                         else
@@ -215,6 +223,10 @@ ValidateAuthToken(
                            IdenTokenUninit();
                            PrincipalIfUninit();
                            ConfigIfUninit();
+
+                           retStatus = CasaStatusBuild(CASA_SEVERITY_ERROR,
+                                                       CASA_FACILITY_AUTHTOKEN,
+                                                       CASA_STATUS_UNSUCCESSFUL);
                         }
                      }
                   }
diff --git a/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes b/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes
index 41f6c6ee..d3338975 100644
--- a/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes
+++ b/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec  8 15:20:11 MST 2006 - jluciani@novell.com
+
+- Made changes resulting from self-code review of the project. 
+
 -------------------------------------------------------------------
 Mon Dec  4 15:15:44 MST 2006 - jluciani@novell.com
 
diff --git a/CASA-auth-token/server/utilities/IpcLibs/linux/client/cchannel.cpp b/CASA-auth-token/server/utilities/IpcLibs/linux/client/cchannel.cpp
index f3ed5041..7fdaf885 100644
--- a/CASA-auth-token/server/utilities/IpcLibs/linux/client/cchannel.cpp
+++ b/CASA-auth-token/server/utilities/IpcLibs/linux/client/cchannel.cpp
@@ -625,7 +625,7 @@ CChannel::connectionThread(
    // Free SmartCChannel
    delete pSmartCChannel;
 
-   DbgTrace(0, "CChannel::connectionThread- End\n", 0);
+   DbgTrace(1, "CChannel::connectionThread- End\n", 0);
 
    // Exit
 	pthread_exit(NULL);
diff --git a/CASA-auth-token/server/utilities/IpcLibs/linux/client/remoteendpoint.cpp b/CASA-auth-token/server/utilities/IpcLibs/linux/client/remoteendpoint.cpp
index 0afaa559..eed3cc49 100644
--- a/CASA-auth-token/server/utilities/IpcLibs/linux/client/remoteendpoint.cpp
+++ b/CASA-auth-token/server/utilities/IpcLibs/linux/client/remoteendpoint.cpp
@@ -81,7 +81,7 @@ RemoteEndPoint::RemoteEndPoint(
    DbgTrace(1, "RemoteEndPoint::RemoteEndPoint- Start, Obj = %0X\n", this);
 
    // Verify that the specified path is not too long
-   if (strlen(pSocketFileName) < sizeof(sizeof(m_serverUnAddr.sun_path)))
+   if (strlen(pSocketFileName) < sizeof(m_serverUnAddr.sun_path))
    {
       // Initialize our mutex
       pthread_mutex_init(&m_mutex, NULL);
diff --git a/CASA-auth-token/server/utilities/IpcLibs/linux/common/channelproto.cpp b/CASA-auth-token/server/utilities/IpcLibs/linux/common/channelproto.cpp
index 417f733f..1815a900 100644
--- a/CASA-auth-token/server/utilities/IpcLibs/linux/common/channelproto.cpp
+++ b/CASA-auth-token/server/utilities/IpcLibs/linux/common/channelproto.cpp
@@ -25,6 +25,7 @@
 
 //===[ Include files ]=====================================================
 
+#define __STDC_LIMIT_MACROS
 #include "ipcint.h"
 
 //===[ External data ]=====================================================
diff --git a/CASA-auth-token/server/utilities/IpcLibs/linux/server/server.cpp b/CASA-auth-token/server/utilities/IpcLibs/linux/server/server.cpp
index f7ca8e5c..987e63b2 100644
--- a/CASA-auth-token/server/utilities/IpcLibs/linux/server/server.cpp
+++ b/CASA-auth-token/server/utilities/IpcLibs/linux/server/server.cpp
@@ -437,7 +437,7 @@ BindSocket(int socketToBind)
       unlink(listenSocketFile);
 
       // Verify that the specified path is not too long
-      if (strlen(listenSocketFile) < sizeof(sizeof(listenAddr.sun_path)))
+      if (strlen(listenSocketFile) < sizeof(listenAddr.sun_path))
       {
          // Setup the address that the daemon will use to listen
          // for connections.