diff --git a/src/base/bittorrent/ltqbitarray.cpp b/src/base/bittorrent/ltqbitarray.cpp
index 7a2c109f8..270344df1 100644
--- a/src/base/bittorrent/ltqbitarray.cpp
+++ b/src/base/bittorrent/ltqbitarray.cpp
@@ -65,6 +65,6 @@ namespace BitTorrent::LT
         for (int i = 0; i < dataLength; ++i)
             tmp[i] = reverseByte(bitsData[i]);
 
-        return QBitArray::fromBits(tmp.data(), tmp.size());
+        return QBitArray::fromBits(tmp.data(), bits.size());
     }
 }
diff --git a/src/base/path.cpp b/src/base/path.cpp
index 89e3d3b0e..8f72c97ba 100644
--- a/src/base/path.cpp
+++ b/src/base/path.cpp
@@ -29,6 +29,8 @@
 
 #include "path.h"
 
+#include <algorithm>
+
 #include <QDataStream>
 #include <QDir>
 #include <QFileInfo>
@@ -44,8 +46,20 @@ const Qt::CaseSensitivity CASE_SENSITIVITY = Qt::CaseSensitive;
 
 const int PATHLIST_TYPEID = qRegisterMetaType<PathList>("PathList");
 
+namespace
+{
+    QString cleanPath(const QString &path)
+    {
+        const bool hasSeparator = std::any_of(path.cbegin(), path.cend(), [](const QChar c)
+        {
+            return (c == u'/') || (c == u'\\');
+        });
+        return hasSeparator ? QDir::cleanPath(path) : path;
+    }
+}
+
 Path::Path(const QString &pathStr)
-    : m_pathStr {QDir::cleanPath(pathStr)}
+    : m_pathStr {cleanPath(pathStr)}
 {
 }