diff --git a/Projects/Education/Schemas/App-Schema/tutorial.json b/Projects/Education/Schemas/App-Schema/tutorial.json
index cae85ff63..c0d67ff91 100644
--- a/Projects/Education/Schemas/App-Schema/tutorial.json
+++ b/Projects/Education/Schemas/App-Schema/tutorial.json
@@ -3,6 +3,7 @@
     "menuItems": [
         {
             "action": "Play Tutorial",
+            "actionProject": "Foundations",
             "label": "Play",
             "iconPathOn": "play",
             "iconPathOff": "play",
@@ -10,6 +11,7 @@
         },
         {
             "action": "Resume Tutorial",
+            "actionProject": "Foundations",
             "label": "Resume",
             "iconPathOn": "resume",
             "iconPathOff": "resume",
@@ -38,6 +40,7 @@
         },
         {
             "action": "Reset Tutorial Progress",
+            "actionProject": "Foundations",
             "askConfirmation": true,
             "confirmationLabel": "Confirm to Reset",
             "label": "Reset Tutorial Progress",
diff --git a/Projects/Education/UI/Spaces/Docs-Space/DocumentPage.js b/Projects/Education/UI/Spaces/Docs-Space/DocumentPage.js
index ccfe06640..97320d472 100644
--- a/Projects/Education/UI/Spaces/Docs-Space/DocumentPage.js
+++ b/Projects/Education/UI/Spaces/Docs-Space/DocumentPage.js
@@ -2086,7 +2086,7 @@ function newFoundationsDocsDocumentPage() {
                     /*
                     Adding paragarphs is only possible in the default language.
                     */
-                    if (UI.projects.education.spaces.docsSpace.language === UI.projects.foundations.globals.docs.DEFAULT_LANGUAGE) {
+                    if (UI.projects.education.spaces.docsSpace.language === UI.projects.education.globals.docs.DEFAULT_LANGUAGE) {
                         /*
                         We will update the one paragraph we have and we will add the rest. 
                         */
diff --git a/Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js b/Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js
index db85cbe37..1d0e40a6b 100644
--- a/Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js
+++ b/Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js
@@ -142,8 +142,12 @@ function newFoundationsFunctionLibraryUiObjectsFromNodes() {
                     let project = "Foundations"
                     try {
                         let config = JSON.parse(pluginFile.config)
-                        project = config.project
-                        name = config.fileName
+                        if (config.project !== undefined) {
+                            project = config.project
+                        }
+                        if (config.fileName !== undefined) {
+                            name = config.fileName
+                        }
                     } catch (err) { }
 
                     httpRequest(undefined, 'LoadPlugin' + '/' + project + '/' + pluginType + '/' + name + '.json', onFileReceived)