diff --git a/packages/builder/src/components/portal/onboarding/tourHandler.js b/packages/builder/src/components/portal/onboarding/tourHandler.js
index 42d35e6d45..6268e980db 100644
--- a/packages/builder/src/components/portal/onboarding/tourHandler.js
+++ b/packages/builder/src/components/portal/onboarding/tourHandler.js
@@ -7,7 +7,7 @@ const registerNode = async (node, tourStepKey) => {
   }
 
   if (!get(builderStore).tourKey) {
-    console.log("Tour Handler - No active tour ", tourStepKey, node)
+    console.warn("Tour Handler - No active tour ", tourStepKey, node)
     return
   }
 
diff --git a/packages/builder/src/helpers/components.js b/packages/builder/src/helpers/components.js
index 65e4f921e1..4f4f3ed380 100644
--- a/packages/builder/src/helpers/components.js
+++ b/packages/builder/src/helpers/components.js
@@ -243,7 +243,7 @@ export const buildContextTree = (
   }
 
   // Process this component's contexts
-  const def = store.actions.components.getDefinition(rootComponent._component)
+  const def = componentStore.getDefinition(rootComponent._component)
   if (def?.context) {
     tree[currentBranch].push(rootComponent._id)
     const contexts = Array.isArray(def.context) ? def.context : [def.context]
diff --git a/packages/builder/src/stores/builder/BudiStore.js b/packages/builder/src/stores/builder/BudiStore.js
index 3d91938e3d..1acf299921 100644
--- a/packages/builder/src/stores/builder/BudiStore.js
+++ b/packages/builder/src/stores/builder/BudiStore.js
@@ -29,7 +29,7 @@ export default class BudiStore {
      */
     if (opts?.debug) {
       this.subscribe(state => {
-        console.log(`${this.constructor.name}`, state)
+        console.warn(`${this.constructor.name}`, state)
       })
     }
   }
diff --git a/packages/builder/src/stores/builder/tests/builder.test.js b/packages/builder/src/stores/builder/tests/builder.test.js
index eeb7cfe6e6..7aac2489db 100644
--- a/packages/builder/src/stores/builder/tests/builder.test.js
+++ b/packages/builder/src/stores/builder/tests/builder.test.js
@@ -164,7 +164,7 @@ describe("Builder store", () => {
 
   it("Overrite an existing route/path mapping with a new URL", ctx => {
     expect(ctx.test.store.previousTopNavPath).toStrictEqual({})
-    console.log(INITIAL_BUILDER_STATE)
+
     const dataRoute = "/builder/app/:application/data"
     const dataURL = "/builder/app/app_dev_123/data/table/ta_users"
     const updatedURL = "/builder/app/app_dev_123/data/table/ta_employees"