diff --git a/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h b/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h
index 26fdcf5f46418895dd116b39e78633027d297297..25e6393da64724adfe2aa2593b675f2d0da038e9 100644
--- a/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h
+++ b/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h
@@ -87,12 +87,8 @@ class AudioSymmetricRtpSession : public ost::TimerPort, public ost::SymmetricRTP
         };
         SpeexEchoCancel echoCanceller;
 
-    protected:
-
+    private:
         AudioRtpThread *rtpThread_;
-
-    public:
-        friend class AudioRtpThread;
 };
 
 }
diff --git a/daemon/src/audio/audiortp/audio_zrtp_session.cpp b/daemon/src/audio/audiortp/audio_zrtp_session.cpp
index 2f38308487c656b45081690be1a0961f466a1d34..51da042eacb9256468f7e9bb2fe754ff111b3b81 100644
--- a/daemon/src/audio/audiortp/audio_zrtp_session.cpp
+++ b/daemon/src/audio/audiortp/audio_zrtp_session.cpp
@@ -68,11 +68,17 @@ AudioZrtpSession::AudioZrtpSession(SIPCall * sipcall, const std::string& zidFile
 
 AudioZrtpSession::~AudioZrtpSession()
 {
+
+// tmatth:Oct 20 2011:FIXME:
+// This was crashing...seems like it's not necessary. Double check
+// with valgrind/helgrind
+#if 0
     try {
-        terminate();
+        ost::Thread::terminate();
     } catch (...) {
         throw;
     }
+#endif
 
     Manager::instance().getMainBuffer()->unBindAll(ca_->getCallId());
 }