diff --git a/src/internet-stack/udp-test.cc b/src/internet-stack/udp-test.cc
index b568e1c9e..9c22cf78a 100644
--- a/src/internet-stack/udp-test.cc
+++ b/src/internet-stack/udp-test.cc
@@ -260,6 +260,7 @@ UdpSocketImplTest::DoRun (void)
 
   Ptr<SocketFactory> txSocketFactory = txNode->GetObject<UdpSocketFactory> ();
   Ptr<Socket> txSocket = txSocketFactory->CreateSocket ();
+  txSocket->SetAllowBroadcast (true);
 
   // ------ Now the tests ------------
 
diff --git a/src/routing/olsr/olsr-routing-protocol.cc b/src/routing/olsr/olsr-routing-protocol.cc
index e7e8d9e0a..ed3fbf3ab 100644
--- a/src/routing/olsr/olsr-routing-protocol.cc
+++ b/src/routing/olsr/olsr-routing-protocol.cc
@@ -293,7 +293,7 @@ void RoutingProtocol::DoStart ()
       Ptr<Socket> socket = Socket::CreateSocket (GetObject<Node> (), 
                                                  UdpSocketFactory::GetTypeId());
       socket->SetAllowBroadcast (true);
-      InetSocketAddress inetAddr (addr.GetSubnetDirectedBroadcast (m_ipv4->GetAddress (i, 0).GetMask ()), OLSR_PORT_NUMBER);
+      InetSocketAddress inetAddr (m_ipv4->GetAddress (i, 0).GetLocal (), OLSR_PORT_NUMBER);
       socket->SetRecvCallback (MakeCallback (&RoutingProtocol::RecvOlsr,  this));
       if (socket->Bind (inetAddr))
         {