diff --git a/moses/src/LanguageModelKen.cpp b/moses/src/LanguageModelKen.cpp
index e4a5e328f..3f0a471dd 100644
--- a/moses/src/LanguageModelKen.cpp
+++ b/moses/src/LanguageModelKen.cpp
@@ -127,12 +127,14 @@ template <class Model> void LanguageModelKen<Model>::TranslateIDs(const std::vec
 }
 
 template <class Model> LanguageModelKen<Model>::LanguageModelKen(bool lazy)
-  :m_ngram(NULL), m_lazy(lazy)
+  :m_ngram(NULL), m_lazy(lazy), m_nullContextState(NULL), m_beginSentenceState(NULL)
 {
 }
 
 template <class Model> LanguageModelKen<Model>::~LanguageModelKen()
 {
+  delete m_nullContextState;
+  delete m_beginSentenceState;
   delete m_ngram;
 }
 
diff --git a/moses/src/PhraseDictionaryTree.cpp b/moses/src/PhraseDictionaryTree.cpp
index 70f4a7b03..060835fec 100644
--- a/moses/src/PhraseDictionaryTree.cpp
+++ b/moses/src/PhraseDictionaryTree.cpp
@@ -1,5 +1,6 @@
 // $Id$
 // vim:tabstop=2
+#include <boost/shared_ptr.hpp>
 #include "PhraseDictionaryTree.h"
 #include <map>
 #include <cassert>
@@ -121,18 +122,19 @@ typedef LVoc<std::string> WordVoc;
 
 static WordVoc* ReadVoc(const std::string& filename)
 {
-  static std::map<std::string,WordVoc*> vocs;
+  static std::map<std::string,boost::shared_ptr<WordVoc> > vocs;
 #ifdef WITH_THREADS
   boost::mutex mutex;
   boost::mutex::scoped_lock lock(mutex);
 #endif
-  std::map<std::string,WordVoc*>::iterator vi = vocs.find(filename);
+  std::map<std::string,boost::shared_ptr<WordVoc> >::iterator vi = vocs.find(filename);
   if (vi == vocs.end()) {
-    WordVoc* voc = new WordVoc();
-    voc->Read(filename);
-    vocs[filename] = voc;
+    boost::shared_ptr<WordVoc> p(new WordVoc());
+    // WordVoc* voc = new WordVoc();
+    p.get()->Read(filename);
+    vocs[filename] = p;
   }
-  return vocs[filename];
+  return vocs[filename].get();
 }