diff --git a/ImageProcessing.cpp b/ImageProcessing.cpp
index c69383e..8caf0c9 100644
--- a/ImageProcessing.cpp
+++ b/ImageProcessing.cpp
@@ -68,7 +68,8 @@ Pix * convertImage (const QImage &image) {
   }
   pixSetResolution (pix, resolutionX, resolutionY);
 
-  return pixEndianByteSwapNew (pix);
+  pixEndianByteSwap (pix);
+  return pix;
 }
 
 QImage convertImage (Pix &image) {
diff --git a/Manager.cpp b/Manager.cpp
index 7f6ffe9..38c44ad 100644
--- a/Manager.cpp
+++ b/Manager.cpp
@@ -187,6 +187,12 @@ void Manager::applySettings () {
 }
 
 Manager::~Manager () {
+  foreach (SelectionDialog * selection, selections_.values ()) {
+    selection->hide ();
+    delete selection;
+  }
+  trayIcon_->hide ();
+  delete trayIcon_->contextMenu ();
   foreach (QThread * thread, threads_) {
     thread->quit ();
     thread->wait (1000000);
diff --git a/SelectionDialog.cpp b/SelectionDialog.cpp
index 8aa0084..56daed3 100644
--- a/SelectionDialog.cpp
+++ b/SelectionDialog.cpp
@@ -23,6 +23,7 @@ SelectionDialog::SelectionDialog (const LanguageHelper &dictionary, QWidget *par
 }
 
 SelectionDialog::~SelectionDialog () {
+  delete languageMenu_;
   delete ui;
 }