Index: source/ariba/communication/BaseCommunication.cpp
===================================================================
--- source/ariba/communication/BaseCommunication.cpp	(revision 4758)
+++ source/ariba/communication/BaseCommunication.cpp	(revision 4762)
@@ -97,5 +97,5 @@
 		IPv4Locator* ipv4locator = dynamic_cast<IPv4Locator*>(*i);
 
-		// TODO: which locators are find to bind to?
+		// TODO: which locators can we find to bind to?
 		// localhost is not too bad, works when testing locally
 		// with several instances. the manual override currently
Index: source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- source/ariba/overlay/BaseOverlay.cpp	(revision 4758)
+++ source/ariba/overlay/BaseOverlay.cpp	(revision 4762)
@@ -696,6 +696,5 @@
 	/* Handle spovnet instance join requests
 	 */
-	else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest) &&
-						state == BaseOverlayStateInitiator){
+	else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest) ){
 
 		logging_debug(
@@ -748,6 +747,5 @@
 		return true;
 
-	} // else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest)
-	  //          && state == BaseOverlayStateInitiator)
+	} // else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest))
 
 	/* ************************************************************************