diff --git a/src/lib/ApplicationStateMonitor.h b/src/lib/ApplicationStateMonitor.h
index ddaeb3f6..766b9668 100644
--- a/src/lib/ApplicationStateMonitor.h
+++ b/src/lib/ApplicationStateMonitor.h
@@ -1,6 +1,7 @@
 #ifndef APPLICATION_STATE_MONITOR_H
 #define APPLICATION_STATE_MONITOR_H
 
+#include <memory>
 #include <mutex>
 #include <set>
 #include <vector>
diff --git a/src/lib_gui/platform_includes/includesLinux.h b/src/lib_gui/platform_includes/includesLinux.h
index 5b75737b..b0540a12 100644
--- a/src/lib_gui/platform_includes/includesLinux.h
+++ b/src/lib_gui/platform_includes/includesLinux.h
@@ -25,7 +25,7 @@ void setupApp(int argc, char *argv[])
 	QDir coatiDir((userdir + "/.config/coati").c_str());
 	userdir.append("/.config/sourcetrail/");
 
-	UserPaths::setUserDataPath(userdir);
+	UserPaths::setUserDataPath(FilePath(userdir));
 
 	QString userDataPath(userdir.c_str());
 	QDir dataDir(userdir.c_str());
@@ -41,7 +41,7 @@ void setupApp(int argc, char *argv[])
 		}
 	}
 
-	utility::copyNewFilesFromDirectory(QString::fromStdString(ResourcePaths::getFallbackPath()), userDataPath);
+	utility::copyNewFilesFromDirectory(QString::fromStdString(ResourcePaths::getFallbackPath().str()), userDataPath);
 	utility::copyNewFilesFromDirectory(QString::fromStdString(AppPath::getAppPath() + "/user/" ), userDataPath);
 }