diff --git a/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OAuth2AuthenticationPolicyBuilder.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OAuth2AuthenticationPolicyBuilder.java
index b32cfba6e..014ffc163 100644
--- a/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OAuth2AuthenticationPolicyBuilder.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/OAuth2AuthenticationPolicyBuilder.java
@@ -25,6 +25,7 @@ public final class OAuth2AuthenticationPolicyBuilder
 
   OAuth2AuthenticationPolicyBuilder() {
     super();
+    this.authenticationData.setEndpoints(new OAuth2AuthenticationPropertiesEndpoints());
   }
 
   public OAuth2AuthenticationPolicyBuilder endpoints(
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowDefinitionId.java b/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowDefinitionId.java
index 2edbad5ed..023cefe9b 100644
--- a/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowDefinitionId.java
+++ b/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowDefinitionId.java
@@ -21,6 +21,8 @@
 
 public record WorkflowDefinitionId(String namespace, String name, String version) {
 
+  public static final String DEFAULT_SEPARATOR = ":";
+
   public static WorkflowDefinitionId of(Workflow workflow) {
     Document document = workflow.getDocument();
     return new WorkflowDefinitionId(
@@ -36,7 +38,7 @@ public static WorkflowDefinitionId fromName(String name) {
 
   @Override
   public String toString() {
-    return toString(":");
+    return toString(DEFAULT_SEPARATOR);
   }
 
   public String toString(String separator) {