diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/core/event/EventTypeFilter.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/core/event/EventTypeFilter.java
index 0f9af1272c6..6868325465f 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/core/event/EventTypeFilter.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/core/event/EventTypeFilter.java
@@ -78,14 +78,14 @@ public boolean acceptsEvent(String type, Object event, Function<String, Object>
             return false;
         }
 
-        logger.debug("This event is subscribed to a message type {} with payload {}", type, event);
         if (resolver == null) {
             return this.type.equals(type);
         }
 
         if (this.type.equals(type) && correlationManager != null && correlationManager.isSubscribe(messageRef)) {
+            logger.debug("This event is subscribed to a message type {} with payload {}", type, event);
             if (event == null) {
-                logger.debug("This event is subscribed to a message ref {}", type);
+                logger.debug("Cannot compute subscription for messageref {} and type {}", messageRef, type);
                 return false;
             }
             CorrelationInstance messageCorrelation = correlationManager.computeCorrelationInstance(messageRef, event);
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/impl/actions/AbstractNodeInstanceAction.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/impl/actions/AbstractNodeInstanceAction.java
index 569a3faceb3..aa1d5756e7d 100644
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/impl/actions/AbstractNodeInstanceAction.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/impl/actions/AbstractNodeInstanceAction.java
@@ -24,7 +24,7 @@
 import org.jbpm.process.instance.impl.Action;
 import org.jbpm.workflow.instance.node.CompositeNodeInstance;
 import org.kie.api.runtime.process.NodeInstance;
-import org.kie.api.runtime.process.WorkflowProcessInstance;
+import org.kie.api.runtime.process.NodeInstanceContainer;
 import org.kie.kogito.internal.process.runtime.KogitoProcessContext;
 
 public abstract class AbstractNodeInstanceAction implements Action, Serializable {
@@ -39,7 +39,7 @@ protected AbstractNodeInstanceAction(String attachedToNodeId) {
 
     @Override
     public void execute(KogitoProcessContext context) throws Exception {
-        WorkflowProcessInstance pi = context.getNodeInstance().getProcessInstance();
+        NodeInstanceContainer pi = context.getNodeInstance().getNodeInstanceContainer();
         NodeInstance nodeInstance = findNodeByUniqueId(pi.getNodeInstances(), attachedToNodeId);
         if (nodeInstance != null) {
             execute(nodeInstance);
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/StateBasedNodeInstance.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/StateBasedNodeInstance.java
index 6b69126d81c..2b0517718c6 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/StateBasedNodeInstance.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/StateBasedNodeInstance.java
@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 
 import org.drools.core.common.InternalAgenda;
 import org.drools.core.common.ReteEvaluator;
@@ -100,11 +99,11 @@ public void internalTrigger(KogitoNodeInstance from, String type) {
                                 .generateId()
                                 .timerId(Long.toString(timer.getId()))
                                 .expirationTime(createTimerInstance(timer))
-                                .processInstanceId(getProcessInstance().getStringId())
+                                .rootProcessId(getProcessInstance().getRootProcessId())
                                 .rootProcessInstanceId(getProcessInstance().getRootProcessInstanceId())
                                 .processId(getProcessInstance().getProcessId())
-                                .rootProcessId(getProcessInstance().getRootProcessId())
-                                .nodeInstanceId(Optional.ofNullable(from).map(KogitoNodeInstance::getStringId).orElse(null))
+                                .processInstanceId(getProcessInstance().getStringId())
+                                .nodeInstanceId(this.getId())
                                 .build();
                 String jobId = jobService.scheduleProcessInstanceJob(jobDescription);
                 timerInstances.add(jobId);
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/TimerNodeInstance.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/TimerNodeInstance.java
index 054ef0ef8de..452e9785287 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/TimerNodeInstance.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/TimerNodeInstance.java
@@ -23,7 +23,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
@@ -91,7 +90,7 @@ public void internalTrigger(KogitoNodeInstance from, String type) {
                                     .rootProcessInstanceId(getProcessInstance().getRootProcessInstanceId())
                                     .processId(getProcessInstance().getProcessId())
                                     .rootProcessId(getProcessInstance().getRootProcessId())
-                                    .nodeInstanceId(Optional.ofNullable(from).map(KogitoNodeInstance::getStringId).orElse(null))
+                                    .nodeInstanceId(this.getId())
                                     .build();
                     JobsService jobService = processRuntime.getJobsService();
                     String jobId = jobService.scheduleProcessInstanceJob(jobDescription);