diff --git a/GSWeb.framework/GSWRecording.m b/GSWeb.framework/GSWRecording.m
index 968af61..f0c2091 100644
--- a/GSWeb.framework/GSWRecording.m
+++ b/GSWeb.framework/GSWRecording.m
@@ -205,9 +205,9 @@ RCS_ID("$Id$")
                  range:NSMakeRange(0,[contentString length])];
 
   // Set new Content Length
-  [response setHeader:[NSString stringWithFormat:@"%d",[contentString length]]
+  [response setHeader:GSWIntToNSString([contentString length])
             forKey:@"GSWHTTPHeader_ContentLength"];
-  [response setHeader:[NSString stringWithFormat:@"%d",contentLength]
+  [response setHeader:GSWIntToNSString(contentLength)
             forKey:@"x-gsweb-unwildcarded-content-length"];
   [response setContentString:contentString];
 
diff --git a/GSWeb.framework/GSWRequest.m b/GSWeb.framework/GSWRequest.m
index 38bd724..3de39d3 100644
--- a/GSWeb.framework/GSWRequest.m
+++ b/GSWeb.framework/GSWRequest.m
@@ -466,7 +466,7 @@ RCS_ID("$Id$")
     {
       NSArray* adaptors = [[GSWApplication application]adaptors];
       if ([adaptors count]>0)
-        serverPort = [NSString stringWithFormat:@"%d",[(GSWAdaptor*)[adaptors objectAtIndex:0] port]];
+        serverPort = GSWIntToNSString([(GSWAdaptor*)[adaptors objectAtIndex:0] port]);
     }
   return serverPort;
 }
@@ -2596,7 +2596,7 @@ into
             applicationNumber=[gswinst intValue];
         };
       if (applicationNumber>=0)
-        [dict setObject:[NSString stringWithFormat:@"%d",applicationNumber]
+        [dict setObject:GSWIntToNSString(applicationNumber)
               forKey:GSWKey_InstanceID[GSWebNamingConv]];
   
       ASSIGN(_uriElements,[NSDictionary dictionaryWithDictionary:dict]);
diff --git a/GSWeb.framework/GSWResponse.m b/GSWeb.framework/GSWResponse.m
index 6a34a19..751b28b 100644
--- a/GSWeb.framework/GSWResponse.m
+++ b/GSWeb.framework/GSWResponse.m
@@ -257,8 +257,6 @@ static NSArray* cacheControlHeaderValues=nil;
 //--------------------------------------------------------------------
 -(void)_finalizeInContext:(GSWContext*)aContext
 {
-  GSWRequest* request=nil;
-  int applicationNumber=-1;
   int dataLength=0;
   NSString* dataLengthString=nil;
   NSData* content=nil;
@@ -287,13 +285,13 @@ static NSArray* cacheControlHeaderValues=nil;
 
   // Add load info to headers
   if (![self headersForKey:GSWHTTPHeader_LoadAverage[GSWebNamingConv]])
-    [self setHeader:[NSString stringWithFormat:@"%d",[GSWApp activeSessionsCount]]
+    [self setHeader:GSWIntToNSString([GSWApp activeSessionsCount])
           forKey:GSWHTTPHeader_LoadAverage[GSWebNamingConv]];
 
   // Add refusing new sessions info to headers
   if ([GSWApp isRefusingNewSessions]
       && ![self headersForKey:GSWHTTPHeader_RefuseSessions[GSWebNamingConv]])
-    [self setHeader:[NSString stringWithFormat:@"%d",(int)[GSWApp _refuseNewSessionsTimeInterval]]
+    [self setHeader:GSWIntToNSString((int)[GSWApp _refuseNewSessionsTimeInterval])
           forKey:GSWHTTPHeader_RefuseSessions[GSWebNamingConv]];
 
   [self _finalizeContentEncodingInContext:aContext];
@@ -302,8 +300,7 @@ static NSArray* cacheControlHeaderValues=nil;
   dataLength=[self _contentLength];
   NSDebugMLog(@"dataLength=%d",dataLength);
 
-  dataLengthString=[NSString stringWithFormat:@"%d",
-                             dataLength];
+  dataLengthString=GSWIntToNSString(dataLength);
 
   [self setHeader:dataLengthString
 		forKey:GSWHTTPHeader_ContentLength];
@@ -516,7 +513,7 @@ escapingHTMLAttributeValue:(BOOL)escape
     {
       [self appendContentString:message];
       
-      [self setHeader:[NSString stringWithFormat:@"%d",[[self content] length]] 
+      [self setHeader:GSWIntToNSString([[self content] length])
             forKey:@"content-length"];
     };
   if (isDefinitive)
diff --git a/GSWeb.framework/GSWSession.m b/GSWeb.framework/GSWSession.m
index bf5d60a..406286f 100644
--- a/GSWeb.framework/GSWSession.m
+++ b/GSWeb.framework/GSWSession.m
@@ -931,7 +931,7 @@ RCS_ID("$Id$")
           instance=-1;
         };
       [aResponse addCookie:[GSWCookie cookieWithName:GSWKey_InstanceID[GSWebNamingConv]
-                                      value:[NSString stringWithFormat:@"%d",instance]
+                                      value:GSWIntToNSString(instance)
                                       path:domainForIDCookies
                                       domain:nil
                                       expires:anExpireDate
diff --git a/GSWeb.framework/GSWStatisticsStore.m b/GSWeb.framework/GSWStatisticsStore.m
index 772300d..4e4279d 100644
--- a/GSWeb.framework/GSWStatisticsStore.m
+++ b/GSWeb.framework/GSWStatisticsStore.m
@@ -1,6 +1,6 @@
 /** GSWStatisticsStore.m - <title>GSWeb: Class GSWStatisticsStore</title>
 
-   Copyright (C) 1999-2003 Free Software Foundation, Inc.
+   Copyright (C) 1999-2004 Free Software Foundation, Inc.
   
    Written by:	Manuel Guesdon <mguesdon@orange-concept.com>
    Date: 	Jan 1999
@@ -164,7 +164,7 @@ RCS_ID("$Id$")
 
  // Sessions
 
-  [sessionsDict setObject:[NSString stringWithFormat:@"%d",_sessionsCount]
+  [sessionsDict setObject:GSWIntToNSString(_sessionsCount)
                    forKey:@"Current Active Sessions"];
 
 
@@ -267,11 +267,11 @@ RCS_ID("$Id$")
 //--------------------------------------------------------------------
 -(void)_sessionTerminating:(GSWSession*)aSession
 {
-  int activeSessionsCount;
-  NSArray* statistics;
-  NSDate* sessionBirthDate;
-  NSTimeInterval sessionTimeOut;
-  int sessionRequestCounter;
+  int activeSessionsCount = 0;
+  NSArray* statistics = nil;
+  NSDate* sessionBirthDate = nil;
+  NSTimeInterval sessionTimeOut = nil;
+  int sessionRequestCounter = 0;
   //OK
   LOGObjectFnStart();
   activeSessionsCount=[GSWApp _activeSessionsCount];