diff --git a/src/core/misc.cpp b/src/core/misc.cpp
index 42414d8f6..dc87c6dfb 100644
--- a/src/core/misc.cpp
+++ b/src/core/misc.cpp
@@ -296,8 +296,10 @@ QString misc::friendlyUnit(qreal val, bool is_speed)
     if (val < 0)
         return QCoreApplication::translate("misc", "Unknown", "Unknown (size)");
     int i = 0;
-    while(val >= 1024. && i++<6)
+    while(val >= 1024. && i < 4) {
         val /= 1024.;
+        ++i;
+    }
     QString ret;
     if (i == 0)
         ret = QString::number((long)val) + " " + QCoreApplication::translate("misc", units[0].source, units[0].comment);
diff --git a/src/core/qtlibtorrent/alertdispatcher.cpp b/src/core/qtlibtorrent/alertdispatcher.cpp
index cf5618019..ce7180b5d 100644
--- a/src/core/qtlibtorrent/alertdispatcher.cpp
+++ b/src/core/qtlibtorrent/alertdispatcher.cpp
@@ -105,10 +105,7 @@ void QAlertDispatcher::dispatch(QSharedPointer<Tag> tag,
         return;
 
     bool was_empty = that->alerts.empty();
-
-    that->alerts.push_back(alert_ptr.get());
-    alert_ptr.release();
-
+    that->alerts.push_back(alert_ptr.release());
     if (was_empty)
         that->alerts_condvar.wakeAll();