diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index 2bea250a784..d31a5107bf8 100644
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -158,17 +158,20 @@ public:
    * currently believes to be its own.
    */
   const entity_addr_t& get_myaddr() { return my_inst.addr; }
+protected:
   /**
    * set messenger's address
    */
   void set_myaddr(entity_addr_t a) { my_inst.addr = a; }
+public:
   /**
    * Retrieve the Messenger's name.
    *
    * @return A const reference to the name this Messenger
    * currently believes to be its own.
    */
-  const entity_name_t& get_myname() { return my_inst.name; }  /**
+  const entity_name_t& get_myname() { return my_inst.name; }
+  /**
    * Set the name of the local entity. The name is reported to others and
    * can be changed while the system is running, but doing so at incorrect
    * times may have bad results.
diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index cc10c2762f9..60ec39dbe56 100644
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -387,6 +387,7 @@ public:
   Accepter accepter;
   DispatchQueue dispatch_queue;
 
+  friend class Accepter;
 
   /**
    * Register a new pipe for accept