diff --git a/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js b/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
index 96ad84d41..330c6d668 100644
--- a/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
+++ b/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
@@ -81,9 +81,9 @@ function newTaskFunctions () {
       taskId: node.id,
       taskName: node.name
     }
-    systemEventHandler.raiseEvent('Task Manager', 'Stop Task', event)
 
     node.payload.uiObject.stop(callBackFunction)
+    systemEventHandler.raiseEvent('Task Manager', 'Stop Task', event)
 
     if (node.bot === undefined) { return }
     if (node.bot.processes.length === 0) { return }
diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js
index ea74d27e8..ebddc6dae 100644
--- a/FloatingSpace/UiObject.js
+++ b/FloatingSpace/UiObject.js
@@ -730,13 +730,13 @@ function newUiObject () {
 
     /* We will wait to hear the first onHeartBeat in order to confirm the execution was really started */
     let key = thisObject.payload.node.name + '-' + thisObject.payload.node.type + '-' + thisObject.payload.node.id
-    systemEventHandler.listenToEvent(key, 'Heartbeat', undefined, 'UiObject', onResponse, onHeartBeat)
+    systemEventHandler.listenToEvent(key, 'Running', undefined, 'UiObject', onResponse, onRunning)
 
     function onResponse (message) {
       eventSubscriptionIdHeartbeat = message.eventSubscriptionId
     }
 
-    function onHeartBeat () {
+    function onRunning () {
       if (thisObject.payload === undefined) { return }
       lastHeartBeat = new Date()
       let key = thisObject.payload.node.name + '-' + thisObject.payload.node.type + '-' + thisObject.payload.node.id
@@ -1276,7 +1276,7 @@ function newUiObject () {
         }
 
         labelPoint = {
-          x: position.x - label.length / 2 * fontSize * FONT_ASPECT_RATIO - 5,
+          x: position.x - label.length / 2 * fontSize * FONT_ASPECT_RATIO - 10,
           y: position.y + radius * 7 / 5 + fontSize * FONT_ASPECT_RATIO + 15
         }