diff --git a/src/eclass.cpp b/src/eclass.cpp
index 5289804..64a90fb 100644
--- a/src/eclass.cpp
+++ b/src/eclass.cpp
@@ -206,8 +206,8 @@ void EntityClassQuake3_Construct()
     StringOutputStream gameDirectory(256);
     const char *basegame = GlobalRadiant().getRequiredGameDescriptionKeyValue("basegame");
     const char *gamename = GlobalRadiant().getGameName();
-    baseDirectory << GlobalRadiant().getGameToolsPath() << basegame << '/';
-    gameDirectory << GlobalRadiant().getGameToolsPath() << gamename << '/';
+    baseDirectory << GlobalRadiant().getEnginePath() << basegame << '/';
+    gameDirectory << GlobalRadiant().getEnginePath() << gamename << '/';
 
     class LoadEntityDefinitionsVisitor : public EClassModules::Visitor {
         const char *baseDirectory;
diff --git a/src/mainframe.cpp b/src/mainframe.cpp
index 7eb9641..a13e366 100644
--- a/src/mainframe.cpp
+++ b/src/mainframe.cpp
@@ -214,7 +214,9 @@ void EnginePath_Realise()
 
 const char *EnginePath_get()
 {
-    ASSERT_MESSAGE(g_enginepath_unrealised == 0, "EnginePath_get: engine path not realised");
+    if (g_enginepath_unrealised == 0) {
+        g_enginePathObservers.realise();
+    }
     return g_strEnginePath.c_str();
 }