diff --git a/src/actionshandler.h b/src/actionshandler.h
index a0ae207d7..af8855769 100644
--- a/src/actionshandler.h
+++ b/src/actionshandler.h
@@ -47,7 +47,7 @@ Q_SIGNALS:
     /// \brief Show error or information message.
     ///
     /// These messages will be displayed in the room view header.
-    void showMessage(MessageType messageType, QString message);
+    void showMessage(ActionsHandler::MessageType messageType, QString message);
 
     void roomChanged();
     void connectionChanged();
diff --git a/src/customemojimodel.cpp b/src/customemojimodel.cpp
index 615ffd499..f07f803d5 100644
--- a/src/customemojimodel.cpp
+++ b/src/customemojimodel.cpp
@@ -91,7 +91,7 @@ QString CustomEmojiModel::preprocessText(const QString &it)
 {
     auto cp = it;
     for (const auto& emoji : qAsConst(d->emojies)) {
-        cp.replace(emoji.regexp, QStringLiteral(R"(<img data-mx-emoticon="" src="%1" alt="%2" title="%2" height="32" vertical-align="middle" />)").arg(emoji.url).arg(emoji.name));
+        cp.replace(emoji.regexp, QStringLiteral(R"(<img data-mx-emoticon="" src="%1" alt="%2" title="%2" height="32" vertical-align="middle" />)").arg(emoji.url, emoji.name));
     }
     return cp;
 }
diff --git a/src/filetypesingleton.h b/src/filetypesingleton.h
index 3032bc02b..06519c1f6 100644
--- a/src/filetypesingleton.h
+++ b/src/filetypesingleton.h
@@ -29,8 +29,8 @@ public:
     enum MatchMode { MatchDefault, MatchExtension, MatchContent };
     Q_ENUM(MatchMode)
 
-    Q_INVOKABLE QMimeType mimeTypeForFile(const QString &fileName, MatchMode mode = MatchDefault) const;
-    Q_INVOKABLE QMimeType mimeTypeForFile(const QFileInfo &fileInfo, MatchMode mode = MatchDefault) const;
+    Q_INVOKABLE QMimeType mimeTypeForFile(const QString &fileName, FileTypeSingleton::MatchMode mode = MatchDefault) const;
+    Q_INVOKABLE QMimeType mimeTypeForFile(const QFileInfo &fileInfo, FileTypeSingleton::MatchMode mode = MatchDefault) const;
     Q_INVOKABLE QList<QMimeType> mimeTypesForFileName(const QString &fileName) const;
 
     Q_INVOKABLE QMimeType mimeTypeForData(const QByteArray &data) const;
diff --git a/src/roommanager.h b/src/roommanager.h
index d7610579d..46d221f5b 100644
--- a/src/roommanager.h
+++ b/src/roommanager.h
@@ -55,7 +55,7 @@ public:
     UriResolveResult visitUser(User *user, const QString &action) override;
     void joinRoom(Quotient::Connection *account, const QString &roomAliasOrId,
                   const QStringList &viaServers) override;
-    Q_INVOKABLE void visitRoom(Room *room, const QString &eventId) override;
+    Q_INVOKABLE void visitRoom(Quotient::Room *room, const QString &eventId) override;
     Q_INVOKABLE bool visitNonMatrix(const QUrl &url) override;
 
     Q_INVOKABLE void openResource(const QString &idOrUri, const QString &action = {});
@@ -88,11 +88,11 @@ Q_SIGNALS:
 
     /// Ask current room to open the user's details for the give user.
     /// This can assume the user is loaded.
-    void showUserDetail(const User *user);
+    void showUserDetail(const Quotient::User *user);
 
     /// Ask current room to show confirmation dialog to open direct chat.
     /// This can assume the user is loaded.
-    void askDirectChatConfirmation(const User *user);
+    void askDirectChatConfirmation(const Quotient::User *user);
 
     /// Displays warning to the user.
     void warning(const QString &title, const QString &message);