diff --git a/srsue/hdr/mac/demux.h b/srsue/hdr/mac/demux.h
index 2a8a574b0..f9fe02a2b 100644
--- a/srsue/hdr/mac/demux.h
+++ b/srsue/hdr/mac/demux.h
@@ -83,9 +83,9 @@ private:
   bool is_uecrid_successful;
 
   phy_interface_mac_common* phy_h;
-  srslte::log              *log_h;
-  srslte::timers::timer    *time_alignment_timer;
-  rlc_interface_mac        *rlc;
+  srslte::log*              log_h;
+  srslte::timers::timer*    time_alignment_timer;
+  rlc_interface_mac*        rlc;
   mac_interface_demux*      mac;
 
   // Buffer of PDUs
diff --git a/srsue/src/mac/demux.cc b/srsue/src/mac/demux.cc
index 1987e43a6..78015cb2e 100644
--- a/srsue/src/mac/demux.cc
+++ b/srsue/src/mac/demux.cc
@@ -29,8 +29,17 @@
 #include "srslte/interfaces/ue_interfaces.h"
 
 namespace srsue {
-    
-demux::demux() : mac_msg(20), mch_mac_msg(20), pending_mac_msg(20), rlc(NULL)
+
+demux::demux() :
+  mac_msg(20),
+  mch_mac_msg(20),
+  pending_mac_msg(20),
+  rlc(NULL),
+  is_uecrid_successful(false),
+  phy_h(nullptr),
+  log_h(nullptr),
+  time_alignment_timer(nullptr),
+  mac(nullptr)
 {
 }