diff --git a/stuff/plugins/.gitkeep b/stuff/plugins/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/stuff/plugins/.gitkeep
diff --git a/stuff/toonzfarm/.gitkeep b/stuff/toonzfarm/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/stuff/toonzfarm/.gitkeep
diff --git a/toonz/sources/tcomposer/CMakeLists.txt b/toonz/sources/tcomposer/CMakeLists.txt
index dea9ca5..9d537fc 100644
--- a/toonz/sources/tcomposer/CMakeLists.txt
+++ b/toonz/sources/tcomposer/CMakeLists.txt
@@ -10,4 +10,5 @@ target_link_libraries(tcomposer
     tnzstdfx
     sound
     image
-    colorfx)
+    colorfx
+    toonzqt)
diff --git a/toonz/sources/tcomposer/tcomposer.cpp b/toonz/sources/tcomposer/tcomposer.cpp
index b6cd7dc..1cd3a5b 100644
--- a/toonz/sources/tcomposer/tcomposer.cpp
+++ b/toonz/sources/tcomposer/tcomposer.cpp
@@ -66,6 +66,9 @@
 #include "tvectorbrushstyle.h"
 #include "tpalette.h"
 
+// TnzQt includes
+#include "toonzqt/pluginloader.h"
+
 // Qt includes
 #include <QApplication>
 #include <QWaitCondition>
@@ -798,6 +801,9 @@ int main(int argc, char *argv[])
 		factory.create(FarmControllerName, FarmControllerPort, &FarmController);
 	}
 
+	while (!PluginLoader::load_entries(""))
+		app.processEvents();
+
 	std::pair<int, int> framePair(1, 0);
 
 	try {
diff --git a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp
index 9b5ec10..5a9f70f 100644
--- a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp
+++ b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp
@@ -2384,7 +2384,7 @@ void ControllerService::onStart(int argc, char *argv[])
 
 	TFilePath globalRoot = getGlobalRoot();
 	if (globalRoot.isEmpty()) {
-		QString errMsg("Unable to get TFARMGLOBALROOT environment variable\n");
+		QString errMsg("Unable to get FARMROOT environment variable\n");
 		addToMessageLog(errMsg);
 
 		// exit the program
diff --git a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
index a8fa96d..abbaeda 100644
--- a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
+++ b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
@@ -835,7 +835,7 @@ void FarmServerService::onStart(int argc, char *argv[])
 	if (!lRootDirExists) {
 		string errMsg("Unable to start the Server");
 		errMsg += "\n";
-		errMsg += "The directorya specified as Local Root does not exist";
+		errMsg += "The directory specified as Local Root does not exist";
 		errMsg += "\n";
 
 		addToMessageLog(errMsg);