--- a/src/wifi/model/edca-txop-n.cc	Wed May 06 23:14:06 2015 +0200
+++ b/src/wifi/model/edca-txop-n.cc	Wed May 06 14:23:50 2015 -0700
@@ -240,6 +240,7 @@
   : m_manager (0),
     m_currentPacket (0),
     m_aggregator (0),
+    m_typeOfStation (STA),
     m_blockAckType (COMPRESSED_BLOCK_ACK),
     m_ampduExist (false)
 {

--- a/src/wifi/model/wifi-remote-station-manager.cc	Wed May 06 23:14:06 2015 +0200
+++ b/src/wifi/model/wifi-remote-station-manager.cc	Wed May 06 14:23:50 2015 -0700
@@ -324,6 +324,7 @@
 }
 
 WifiRemoteStationManager::WifiRemoteStationManager ()
+ : m_htSupported (false)
 {
 }
 

--- a/src/wifi/test/wifi-aggregation-test.cc	Wed May 06 23:14:06 2015 +0200
+++ b/src/wifi/test/wifi-aggregation-test.cc	Wed May 06 14:23:50 2015 -0700
@@ -21,6 +21,7 @@
 #include "ns3/string.h"
 #include "ns3/test.h"
 #include "ns3/object-factory.h"
+#include "ns3/simulator.h"
 #include "ns3/wifi-mac-queue.h"
 #include "ns3/mac-low.h"
 #include "ns3/edca-txop-n.h"
@@ -171,6 +172,7 @@
   
   result = (packet != 0);
   NS_TEST_EXPECT_MSG_EQ (result, false, "aggregation failed to stop as queue is empty");
+  Simulator::Destroy ();
 }
 
 //-----------------------------------------------------------------------------