diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp
index c523184fe..2afd3ee34 100644
--- a/src/ca/cac.cpp
+++ b/src/ca/cac.cpp
@@ -183,8 +183,6 @@ cac::~cac ()
     }
     this->iiuListMutex.unlock ();
 
-    this->defaultMutex.lock ();
-
     //
     // shutdown udp and wait for threads to exit
     //
diff --git a/src/ca/udpiiu.cpp b/src/ca/udpiiu.cpp
index 0d8e39ce5..a90a49368 100644
--- a/src/ca/udpiiu.cpp
+++ b/src/ca/udpiiu.cpp
@@ -170,6 +170,9 @@ void udpiiu::repeaterRegistrationMessage ( unsigned attemptNumber )
             saddr.ia.sin_addr.s_addr = htonl ( INADDR_LOOPBACK );
             saddr.ia.sin_port = htons ( this->repeaterPort );   
         }
+        else {
+            saddr.ia.sin_port = htons ( this->repeaterPort );   
+        }
     }
     else {
         saddr.ia.sin_family = AF_INET;