Fix a CI fail.
diff --git a/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl
index f999e2a..e2f4ee7 100644
--- a/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl
@@ -48,7 +48,7 @@
 
     <#if indicator.filterExpressions??>
         <#list indicator.filterExpressions as filterExpression>
-        if(!(new ${filterExpression.expressionObject}().setLeft(${filterExpression.left}).setRight(${filterExpression.right}).match())) {
+        if(!new ${filterExpression.expressionObject}().setLeft(${filterExpression.left}).setRight(${filterExpression.right}).match()) {
             return;
         }
         </#list>
diff --git a/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl
index 0d97284..5e0f431 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl
@@ -59,7 +59,7 @@
         indicator.${field.fieldSetter}(source.${field.fieldGetter}());
     </#list>
         indicator.${indicator.entryMethod.methodName}(<#list indicator.entryMethod.argsExpressions as arg>${arg}<#if arg_has_next>, </#if></#list>);
-        avgAggregator.in(indicator);
+        IndicatorProcess.INSTANCE.in(indicator);
     }
 </#list>
 }