diff -Naurp up-imapproxy-1.2.6/src/main.c up-imapproxy-1.2.6.oden/src/main.c
--- up-imapproxy-1.2.6/src/main.c	2008-01-28 14:15:08.000000000 +0100
+++ up-imapproxy-1.2.6.oden/src/main.c	2008-08-30 14:41:44.000000000 +0200
@@ -618,7 +618,7 @@ int main( int argc, char *argv[] )
     pthread_create( &RecycleThread, &attr, (void *)ICC_Recycle_Loop, NULL );
 
     syslog(LOG_INFO, "%s: Launched ICC recycle thread with id %d", 
-	   fn, RecycleThread );
+	   fn, (int)RecycleThread );
 
     /*
      * Now start listening and accepting connections.
@@ -1075,7 +1075,6 @@ static void SetBannerAndCapability( void
     ICD_Struct conn;
     int BytesRead;
     char *fn = "SetBannerAndCapability()";
-    int NumRef = 0;
 
     /* initialize some stuff */
     memset( &itd, 0, sizeof itd );
diff -Naurp up-imapproxy-1.2.6/src/request.c up-imapproxy-1.2.6.oden/src/request.c
--- up-imapproxy-1.2.6/src/request.c	2008-01-28 14:15:08.000000000 +0100
+++ up-imapproxy-1.2.6.oden/src/request.c	2008-08-30 14:41:44.000000000 +0200
@@ -1197,7 +1197,7 @@ static int Raw_Proxy( ITD_Struct *Client
 	    
 	    if ( Server->TraceOn )
 	    {
-		snprintf( TraceBuf, sizeof TraceBuf - 1, "\n\n-----> C= %d %s SERVER: sd [%d]\n", time( 0 ), ( (TraceUser) ? TraceUser : "Null username" ), Server->conn->sd );
+		snprintf( TraceBuf, sizeof TraceBuf - 1, "\n\n-----> C= %d %s SERVER: sd [%d]\n", time( 0 ), ( (*TraceUser) ? TraceUser : "Null username" ), Server->conn->sd );
 		write( Tracefd, TraceBuf, strlen( TraceBuf ) );
 		write( Tracefd, Server->ReadBuf, status );
 	    }
@@ -1243,7 +1243,7 @@ static int Raw_Proxy( ITD_Struct *Client
 	    
 		if ( Client->TraceOn )
 		{
-		    snprintf( TraceBuf, sizeof TraceBuf - 1, "\n\n-----> C= %d %s CLIENT: sd [%d]\n", time( 0 ), ( (TraceUser) ? TraceUser : "Null username" ), Client->conn->sd );
+		    snprintf( TraceBuf, sizeof TraceBuf - 1, "\n\n-----> C= %d %s CLIENT: sd [%d]\n", time( 0 ), ( (*TraceUser) ? TraceUser : "Null username" ), Client->conn->sd );
 		    write( Tracefd, TraceBuf, strlen( TraceBuf ) );
 		    write( Tracefd, Client->ReadBuf, status );
 		}
@@ -1902,7 +1902,7 @@ extern void HandleRequest( int clientsd 
 		    
 		    if ( BytesRead == -1 )
 		    {
-			syslog( LOG_NOTICE, "%s: Failed to read string literal from client on login." );
+			syslog( LOG_NOTICE, "%s: Failed to read string literal from client on login.", fn );
 			snprintf( SendBuf, BufLen, "%s NO LOGIN failed\r\n", Tag );
 			if ( IMAP_Write( Client.conn, SendBuf, strlen(SendBuf) ) == -1 )
 			{
diff -Naurp up-imapproxy-1.2.6/src/select.c up-imapproxy-1.2.6.oden/src/select.c
--- up-imapproxy-1.2.6/src/select.c	2008-01-28 14:15:08.000000000 +0100
+++ up-imapproxy-1.2.6.oden/src/select.c	2008-08-30 14:41:44.000000000 +0200
@@ -349,7 +349,7 @@ static int Populate_Select_Cache( ITD_St
     {
 	if ( Server->LiteralBytesRemaining )
 	{
-	    syslog( LOG_ERR, "%s: Server response to SELECT command contains unexpected literal data on sd [%d].", fn );
+	    syslog( LOG_ERR, "%s: Server response to SELECT command contains unexpected literal data on sd [%d].", fn, Server->conn );
 	    /*
 	     * Must eat the literal.
 	     */