diff --git a/Changelog b/Changelog
index b3abe5825..eeb2e1d91 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.2.7
+    - BUGFIX: Fix unicode problem in torrent moving code
+    - BUGFIX: Fix possible initialization problem in Web UI
+
 * Sun Apr 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.6
     - BUGFIX: Announce to all trackers at once
     - BUGFIX: Added support for single-thread boost
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 7922d6b1d..2bd4599b5 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -1897,12 +1897,15 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
           if(appendqBExtension)
             appendqBextensionToTorrent(h, false);
 #endif
+          qDebug("A torrent has finished downloading");
           // Move to download directory if necessary
           if(!defaultTempPath.isEmpty()) {
+            qDebug("A torrent has finished downloading and will be moved to the final download location");
             // Check if directory is different
             const QDir current_dir(h.save_path());
             const QDir save_dir(getSavePath(hash));
             if(current_dir != save_dir) {
+              qDebug("current dir is different that final destination, actually move the storage...");
               h.move_storage(save_dir.path());
             }
           }
@@ -1964,7 +1967,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
         if(h.is_valid()) {
           // Attempt to remove old folder if empty
           const QString& old_save_path = TorrentPersistentData::getSavePath(h.hash());
-          const QString new_save_path = QString(p->path.c_str());
+          const QString new_save_path = QString::fromLocal8Bit(p->path.c_str());
           qDebug("Torrent moved from %s to %s", qPrintable(old_save_path), qPrintable(new_save_path));
           qDebug("Attempting to remove %s", qPrintable(old_save_path));
           QDir().rmpath(old_save_path);