diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index 495bd503..021f58ed 100644
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -1476,6 +1476,7 @@ class AppBase:
 
                                     #json_replacement = tmpitem.replace(actualitem[0][0], replacement, 1)
                                     #print("AFTER POST replacement: %s" % json_replacement)
+                                    #json_replacement = replacement
                                     try:
                                         json_replacement = json.loads(replacement)
                                     except json.decoder.JSONDecodeError as e:
diff --git a/frontend/package.json b/frontend/package.json
index bb24de65..0b99f34c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -36,7 +36,7 @@
     "react-alert": "^5.5.0",
     "react-alert-template-basic": "^1.0.0",
     "react-beforeunload": "^2.2.1",
-    "react-chartjs-2": "^2.8.0",
+    "react-chartjs-2": "^2.11.1",
     "react-cookie": "^4.0.1",
     "react-cytoscapejs": "^1.2.0",
     "react-device-detect": "^1.9.10",
@@ -52,7 +52,7 @@
     "react-powerhooks": "0.0.7",
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
-    "react-scripts": "^3.4.1",
+    "react-scripts": "^4.0.1",
     "reactstrap": "^7.1.0",
     "shellwords": "^0.1.1",
     "simplebar": "^4.2.3",
diff --git a/frontend/src/views/AppCreator.jsx b/frontend/src/views/AppCreator.jsx
index 5ee0d1ec..bc5128e7 100644
--- a/frontend/src/views/AppCreator.jsx
+++ b/frontend/src/views/AppCreator.jsx
@@ -1702,7 +1702,7 @@ const AppCreator = (props) => {
 			<FormControl style={{backgroundColor: surfaceColor, color: "white",}}>
 				<DialogTitle><div style={{color: "white"}}>New action</div></DialogTitle>
 				<DialogContent>
-					<a target="_blank" href="https://shuffler.io/docs/apps#actions" style={{textDecoration: "none", color: "#f85a3e"}}>Learn more about actions</Link>
+					<a target="_blank" href="https://shuffler.io/docs/workflows#conditions" style={{textDecoration: "none", color: "#f85a3e"}}>Learn more about actions</a>
 					<div style={{marginTop: "15px"}}/>
 					Name
 					<TextField
@@ -2033,7 +2033,7 @@ const AppCreator = (props) => {
 		<div style={{color: "white"}}>
 			<h2>Actions ({actions.length})</h2>
 			Actions are the tasks performed by an app. Read more about actions and apps
-			<a target="_blank" href="https://shuffler.io/docs/apps#actions" style={{textDecoration: "none", color: "#f85a3e"}}> here</Link>.
+			<a target="_blank" src="https://shuffler.io/docs/apps#actions" style={{textDecoration: "none", color: "#f85a3e"}}> here</a>.
 			<div>
 				{loopActions}
 				<div style={{display: "flex"}}>
diff --git a/frontend/src/views/Apps.jsx b/frontend/src/views/Apps.jsx
index 15289670..9d6263e8 100644
--- a/frontend/src/views/Apps.jsx
+++ b/frontend/src/views/Apps.jsx
@@ -168,6 +168,10 @@ const Apps = (props) => {
 	})
 
 	function sortByKey(array, key) {
+		if (array === undefined || array === null) {
+			return []
+		}
+
     return array.sort(function(a, b) {
         var x = a[key];
         var y = b[key];
@@ -222,6 +226,7 @@ const Apps = (props) => {
 			return response.json()
 		})
     .then((responseJson) => {
+			console.log("Apps: ", responseJson)
 			responseJson = sortByKey(responseJson, "large_image")
 
 			setApps(responseJson)
diff --git a/functions/onprem/worker/worker.go b/functions/onprem/worker/worker.go
index 1c36bdb2..e49e313e 100644
--- a/functions/onprem/worker/worker.go
+++ b/functions/onprem/worker/worker.go
@@ -839,7 +839,7 @@ func shutdown(executionId, workflowId string) {
 		log.Printf("[INFO] Failed abort request: %s", err)
 	}
 
-	sleepDuration := 0
+	sleepDuration := 1
 	log.Printf("[INFO] Finished shutdown (after %d seconds).", sleepDuration)
 	// Allows everything to finish in subprocesses
 	time.Sleep(time.Duration(sleepDuration) * time.Second)
@@ -2754,7 +2754,7 @@ func main() {
 
 		if firstRequest {
 			firstRequest = false
-			workflowExecution.StartedAt = int64(time.Now().Unix())
+			//workflowExecution.StartedAt = int64(time.Now().Unix())
 
 			cacheKey := fmt.Sprintf("workflowexecution-%s", workflowExecution.ExecutionId)
 			requestCache = cache.New(5*time.Minute, 10*time.Minute)