diff --git a/src/audio/audiolayer.h b/src/audio/audiolayer.h
index b0b765e446b9641b1f588ea420faf87e674f92be..44a4d4d15f8c30c8644b48e42383c417d6a23ecf 100644
--- a/src/audio/audiolayer.h
+++ b/src/audio/audiolayer.h
@@ -73,7 +73,7 @@ class AudioLayer {
         , _inChannel( 1 )
         , _outChannel ( 1 )
         , _errorMessage ( 0 )
-        , _mutex (NULL)
+        , _mutex ()
     {
 
     }
@@ -82,7 +82,7 @@ class AudioLayer {
     /**
      * Destructor
      */
-    virtual ~AudioLayer(void){}
+    ~AudioLayer(void){}
 
     virtual void closeLayer( void ) = 0;
 
diff --git a/src/audio/audiostream.cpp b/src/audio/audiostream.cpp
index 9c8638e4a8e5f5dfd43412a592d1b1d0c1a2ff8d..89c6b29b0203416e6870bc072bf14d10fca7d7d7 100644
--- a/src/audio/audiostream.cpp
+++ b/src/audio/audiostream.cpp
@@ -22,7 +22,7 @@
 static pa_channel_map channel_map ;
 
 AudioStream::AudioStream( pa_context* context, int type, std::string desc, double vol )
-		: _audiostream (createStream( context )), _streamType(type), _streamDescription(desc), flag(PA_STREAM_AUTO_TIMING_UPDATE), sample_spec(), _volume()
+		: _audiostream(NULL), _streamType(type), _streamDescription(desc), flag(PA_STREAM_AUTO_TIMING_UPDATE), sample_spec(), _volume()
 { 
   sample_spec.format = PA_SAMPLE_S16LE; 
   sample_spec.rate = 44100; 
@@ -30,7 +30,7 @@ AudioStream::AudioStream( pa_context* context, int type, std::string desc, doubl
   channel_map.channels = 1; 
   pa_cvolume_set( &_volume , 1 , PA_VOLUME_MUTED ) ; // * vol / 100 ;
   
-  //_audiostream =  createStream( context );
+  _audiostream =  createStream( context );
 } 
 
 AudioStream::~AudioStream()