diff --git a/src/linguist/linguist/messagemodel.cpp b/src/linguist/linguist/messagemodel.cpp
index d95e2e25caeafd1dc0da426dcf603c9313d9aa46..fc74a4f29a70ed1eb8a986bfcb1d685f82467c0f 100644
--- a/src/linguist/linguist/messagemodel.cpp
+++ b/src/linguist/linguist/messagemodel.cpp
@@ -266,7 +266,7 @@ bool DataModel::load(const QString &fileName, bool *langGuessed, QWidget *parent
             MessageItem tmp(msg);
             if (msg.type() == TranslatorMessage::Finished)
                 c->incrementFinishedCount();
-            if (msg.type() == TranslatorMessage::Unfinished) {
+            if (msg.type() == TranslatorMessage::Finished || msg.type() == TranslatorMessage::Unfinished) {
                 doCharCounting(tmp.text(), m_srcWords, m_srcChars, m_srcCharsSpc);
                 doCharCounting(tmp.pluralText(), m_srcWords, m_srcChars, m_srcCharsSpc);
                 c->incrementNonobsoleteCount();
@@ -1229,9 +1229,11 @@ int MessageModel::rowCount(const QModelIndex &parent) const
     return 0;
 }
 
-int MessageModel::columnCount(const QModelIndex &) const
+int MessageModel::columnCount(const QModelIndex &parent) const
 {
-    return m_data->modelCount() + 3;
+    if (!parent.isValid())
+        return m_data->modelCount() + 3;
+    return m_data->modelCount() + 2;
 }
 
 QVariant MessageModel::data(const QModelIndex &index, int role) const
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index d2eeea0948438bf6233946b5d8ff1d4c40b7a061..e500bcbb07b15a3578874522ae5a80dcb1480b79 100644
--- a/src/macdeployqt/shared/shared.cpp
+++ b/src/macdeployqt/shared/shared.cpp
@@ -163,8 +163,7 @@ FrameworkInfo parseOtoolLibraryLine(const QString &line, bool useDebugLibs)
         if (state == QtPath) {
             // Check for library name part
             if (part < parts.count() && parts.at(part).contains(".dylib ")) {
-                state = DylibName;
-                info.installName += "/" + (qtPath + "lib/").simplified();
+                info.installName += "/" + (qtPath + currentPart + "/").simplified();
                 info.frameworkDirectory = info.installName;
                 state = DylibName;
                 continue;