diff --git a/src/ca/repeater.cpp b/src/ca/repeater.cpp
index 395ffc503..a8943b2f1 100644
--- a/src/ca/repeater.cpp
+++ b/src/ca/repeater.cpp
@@ -464,9 +464,11 @@ static void register_new_client ( osiSockAddr & from,
         client_list.remove ( *pNewClient );
         pNewClient->~repeaterClient ();
         freeList.release ( pNewClient );
-        epicsUInt16 port = ntohs ( from.ia.sin_port );
-        debugPrintf ( ( "Deleted repeater client=%u (error while sending ack)\n",
-                    port ) );
+#       ifdef DEBUG
+            epicsUInt16 port = ntohs ( from.ia.sin_port );
+            debugPrintf ( ( "Deleted repeater client=%u (error while sending ack)\n",
+                        port ) );
+#       endif
     }
 
     /*
diff --git a/src/cas/generic/outBuf.cc b/src/cas/generic/outBuf.cc
index 06a5399e5..49c34921c 100644
--- a/src/cas/generic/outBuf.cc
+++ b/src/cas/generic/outBuf.cc
@@ -204,9 +204,10 @@ void outBuf::commitMsg ( ca_uint32_t reducedPayloadSize )
         payloadSizeExtended = reducedPayloadSize;
     }
     else {
-        AlignedWireRef < epicsUInt16 > payloadSize ( mp->m_postsize );
+        AlignedWireRef < epicsUInt16 > payloadSizeOnWire ( mp->m_postsize );
+        ca_uint32_t payloadSize = payloadSizeOnWire;
         assert ( reducedPayloadSize <= payloadSize );
-        payloadSize = static_cast < ca_uint16_t > ( reducedPayloadSize );
+        payloadSizeOnWire = static_cast < ca_uint16_t > ( reducedPayloadSize );
     }
     this->commitMsg ();
 }