diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index f19b0f2c..337c58d3 100755
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -3515,7 +3515,7 @@ class AppBase:
                                     timeout = 30 
 
                                     # Check if current app is Shuffle Tools, then set to 55 due to certain actions being slow (ioc parser..) 
-                                    #uu In general, this should be disabled for onprem 
+                                    # In general, this should be disabled for onprem 
                                     if self.action["app_name"].lower() == "shuffle tools":
                                         timeout = 55
 
diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod
index 61f2cde9..ecb9219b 100755
--- a/backend/go-app/go.mod
+++ b/backend/go-app/go.mod
@@ -1,6 +1,6 @@
 module shuffle-shared
 
-//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
+replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
 
 go 1.19
 
diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index aa5d5e97..32fb67ef 100755
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -1049,15 +1049,25 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 
 	workflowExecution, execInfo, _, err := shuffle.PrepareWorkflowExecution(ctx, workflow, request, 10)
 	if err != nil {
+		err = shuffle.SetWorkflowExecution(ctx, workflowExecution, true)
+		if err != nil {
+			log.Printf("[ERROR] Failed setting workflow execution during init (2): %s", err)
+		}
+
 		if strings.Contains(fmt.Sprintf("%s", err), "User Input") {
 			// Special for user input callbacks
 			return workflowExecution, fmt.Sprintf("%s", err), nil
 		} else {
-			log.Printf("[WARNING] Failed in prepareExecution: %s", err)
+			log.Printf("[ERROR] Failed in prepareExecution: %s", err)
 			return shuffle.WorkflowExecution{}, fmt.Sprintf("Failed starting workflow: %s", err), err
 		}
 	}
 
+	err = shuffle.SetWorkflowExecution(ctx, workflowExecution, true)
+	if err != nil {
+		log.Printf("[ERROR] Failed setting workflow execution during init (2): %s", err)
+	}
+
 	err = imageCheckBuilder(execInfo.ImageNames)
 	if err != nil {
 		log.Printf("[ERROR] Failed building the required images from %#v: %s", execInfo.ImageNames, err)
@@ -1643,7 +1653,6 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 		return shuffle.WorkflowExecution{}, "Failed building missing Docker images", err
 	}
 
-	//Org               []Org    `json:"org,omitempty" datastore:"org"`
 	err = shuffle.SetWorkflowExecution(ctx, workflowExecution, true)
 	if err != nil {
 		log.Printf("[WARNING] Error saving workflow execution for updates %s", err)
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 8599d420..0daf7b5f 100755
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -8,7 +8,8 @@ import Workflows from "./views/Workflows";
 import GettingStarted from "./views/GettingStarted";
 import AngularWorkflow from "./views/AngularWorkflow.jsx";
 
-import Header from "./components/Header.jsx";
+//import Header from "./components/Header.jsx";
+import Header from "./components/NewHeader.jsx";
 import theme from "./theme";
 import Apps from "./views/Apps";
 import AppCreator from "./views/AppCreator";
@@ -347,7 +348,6 @@ const App = (message, props) => {
         	    />
         	  }
         	/>
-			<Route exact path="/debug" element={<RuntimeDebugger userdata={userdata} globalUrl={globalUrl} /> }  />
 			<Route exact path="/apps/authentication" element={<UpdateAuthentication serverside={false} userdata={userdata} isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn} register={true} isLoaded={isLoaded} globalUrl={globalUrl} setCookie={setCookie} cookies={cookies} {...props} />} />
         	<Route
         	  exact
@@ -407,6 +407,8 @@ const App = (message, props) => {
         	    />
         	  }
         	/>
+			<Route exact path="/debug" element={<RuntimeDebugger userdata={userdata} globalUrl={globalUrl} /> }  />
+			<Route exact path="/workflows/debug" element={<RuntimeDebugger userdata={userdata} globalUrl={globalUrl} /> }  />
         	<Route
         	  exact
         	  path="/workflows/:key"