diff --git a/src/devices/wifi/mesh-wifi-mac.cc b/src/devices/wifi/mesh-wifi-mac.cc
index 407d8add5..a5857e58f 100644
--- a/src/devices/wifi/mesh-wifi-mac.cc
+++ b/src/devices/wifi/mesh-wifi-mac.cc
@@ -306,17 +306,20 @@ MeshWifiMac::SetBeaconInterval (Time interval)
 void
 MeshWifiMac::DoDispose (void)
 {
+	NS_LOG_FUNCTION (this);
 	delete m_rxMiddle;
 	delete m_dcfManager;
 	//Delete smart pointers:
-	m_beaconSendEvent.Cancel ();
-	m_beaconFormEvent.Cancel ();
+	m_rxMiddle = 0;
 	m_low = 0;
+	m_dcfManager = 0;
+	m_phy = 0;
 	m_BE = 0;
 	m_VO = 0;
+	m_peerManager = 0;
+	m_beaconSendEvent.Cancel ();
+	m_beaconFormEvent.Cancel ();
 	m_beaconDca = 0;
-	m_phy = 0;
-        m_peerManager=0;
 	WifiMac::DoDispose ();
 }
 
diff --git a/src/helper/mesh-wifi-helper.cc b/src/helper/mesh-wifi-helper.cc
index dc1ce52b9..f74c09c2e 100644
--- a/src/helper/mesh-wifi-helper.cc
+++ b/src/helper/mesh-wifi-helper.cc
@@ -180,7 +180,7 @@ MeshWifiHelper::Install (const WifiPhyHelper &phyHelper, NodeContainer c, uint8_
 	{
 		Ptr<Node> node = *i;
 		Ptr<L2RoutingNetDevice> virtualDevice = m_deviceFactory.Create<L2RoutingNetDevice> ();
-		Ptr<WifiPeerManager>pPeer = m_peerManager.Create<WifiPeerManager > ();
+		Ptr<WifiPeerManager> pPeer = m_peerManager.Create<WifiPeerManager > ();
 		devices.Add (virtualDevice);
 		std::vector<Ptr<WifiNetDevice> > nodeDevices;
 		for (uint8_t k=0; k<numOfPorts; k++)
@@ -193,7 +193,6 @@ MeshWifiHelper::Install (const WifiPhyHelper &phyHelper, NodeContainer c, uint8_
 			device->SetMac (mac);
 			device->SetPhy (phy);
 			device->SetRemoteStationManager (manager);
-			//mac ->SetPeerLinkManager (pPeer);
 			//create L2RoutingNetDevice and add WifiNetDevice to it
 			node->AddDevice(device);
 			nodeDevices.push_back(device);