diff --git a/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java b/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
index 57fea37..794a44d 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
@@ -46,25 +46,6 @@
 
         this.editor = new Editor(graphComponent);
 
-        graph.getModel().addListener(mxEvent.CHANGE, new mxIEventListener() {
-            public void invoke(Object sender, mxEventObject evt) {
-                List<mxCell> terminals = new ArrayList<>();
-                mxCell cell = null;
-                for (Object change : ((List) evt.getProperties().get("changes"))) {
-                    if (change instanceof mxGraphModel.mxTerminalChange) {
-                        mxGraphModel.mxTerminalChange terminalChange = (mxGraphModel.mxTerminalChange) change;
-                        cell = (mxCell) terminalChange.getCell();
-                        mxCell terminal = (mxCell) terminalChange.getTerminal();
-                        terminals.add(terminal);
-                    }
-                }
-                if (terminals.size() == 2) {
-                    if (!editor.connectEdge(cell, terminals.get(0), terminals.get(1))) {
-                        graph.removeCells(new mxCell[]{cell});
-                    }
-                }
-            }
-        });
         getContentPane().add(graphComponent);
         new mxRubberband(graphComponent);
         graph.setAllowDanglingEdges(false);
diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java b/AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java
index b0db12f..ed5bfa9 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java
@@ -367,7 +367,7 @@
     public void addResourcePath(ResourcePath parentPath, String resName) {
         // Force to change to data-flow modeling stage
         boolean stageChanged = changeStage(STAGE_DATA_FLOW_MODELING);
-        if (stageChanged) {
+        if (!stageChanged) {
             return;
         }
         ((DataFlowModelingStage) curStage).addResourcePath(parentPath, resName);
@@ -377,7 +377,7 @@
     public void addChannel(DataTransferChannel channelGen) {
         // Force to change to data-flow modeling stage
         boolean stageChanged = changeStage(STAGE_DATA_FLOW_MODELING);
-        if (stageChanged) {
+        if (!stageChanged) {
             return;
         }
         ((DataFlowModelingStage) curStage).addChannel(channelGen);
@@ -387,7 +387,7 @@
     public void addIOChannel(DataTransferChannel ioChannelGen) {
         // Force to change to data-flow modeling stage
         boolean stageChanged = changeStage(STAGE_DATA_FLOW_MODELING);
-        if (stageChanged) {
+        if (!stageChanged) {
             return;
         }
         ((DataFlowModelingStage) curStage).addIOChannel(ioChannelGen);
@@ -397,7 +397,7 @@
     public void addFormulaChannel(FormulaChannel formulaChannelGen) {
         // Force to change to data-flow modeling stage
         boolean stageChanged = changeStage(STAGE_DATA_FLOW_MODELING);
-        if (stageChanged) {
+        if (!stageChanged) {
             return;
         }
         ((DataFlowModelingStage) curStage).addFormulaChannel(formulaChannelGen);
diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DataFlowModelingStage.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DataFlowModelingStage.java
index 34117ba..d4d0006 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DataFlowModelingStage.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DataFlowModelingStage.java
@@ -275,7 +275,7 @@
             DataTransferChannel ch2 = parser.parseChannel(getModel());
             for (ChannelMember chm2 : ch2.getInputChannelMembers()) {
                 for (ChannelMember chm : ch.getInputChannelMembers()) {
-                    if (chm2.getResource() == chm.getResource()) {
+                    if (chm2.getResource().getResourceHierarchy() == chm.getResource().getResourceHierarchy()) {
                         chm.setStateTransition(chm2.getStateTransition());
                         break;
                     }
@@ -283,7 +283,7 @@
             }
             for (ChannelMember chm2 : ch2.getOutputChannelMembers()) {
                 for (ChannelMember chm : ch.getOutputChannelMembers()) {
-                    if (chm2.getResource() == chm.getResource()) {
+                    if (chm2.getResource().getResourceHierarchy() == chm.getResource().getResourceHierarchy()) {
                         chm.setStateTransition(chm2.getStateTransition());
                         break;
                     }
@@ -291,7 +291,7 @@
             }
             for (ChannelMember chm2 : ch2.getReferenceChannelMembers()) {
                 for (ChannelMember chm : ch.getReferenceChannelMembers()) {
-                    if (chm2.getResource() == chm.getResource()) {
+                    if (chm2.getResource().getResourceHierarchy() == chm.getResource().getResourceHierarchy()) {
                         chm.setStateTransition(chm2.getStateTransition());
                         break;
                     }
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index 2586162..f8ecbc6 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -679,7 +679,8 @@
 		// Check duplication.
 		String getterName = getterPrefix + getComponentName(resourceNode.getResourceHierarchy(), langSpec);
 		for (MethodDeclaration method: ancestorComponent.getMethods()) {
-			if (method.getName().equals(getterName) && method.getParameters().size() == getterParams.size()) return null;
+			if (method.getName().equals(getterName) 
+					&& (method.getParameters() == null ? 0 : method.getParameters().size()) == getterParams.size()) return null;
 		}
 		
 		// Declare the getter method of the resource state.
@@ -993,7 +994,7 @@
 													arg = filledPath.getPathParams().get(i - 1);
 												}
 												Term condition = new Term(DataConstraintModel.eq, new Expression[] {
-														new Parameter("self" + (i > 1 ? i : "")), 
+														new Parameter("self" + (i > 1 ? i : ""), DataConstraintModel.typeString), 
 														arg});
 												if (conditions == null) {
 													conditions = condition;
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
index b646911..32b9289 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
@@ -391,7 +391,8 @@
 				for (Map.Entry<ResourceHierarchy, MethodDeclaration> entry: getters) {
 					ResourceHierarchy r = entry.getKey();
 					MethodDeclaration m = entry.getValue();
-					if (r == ancestorNode.getResourceHierarchy() && m.getName().equals(getterName) && m.getParameters().size() == getterParams.size()) {
+					if (r == ancestorNode.getResourceHierarchy() && m.getName().equals(getterName) 
+							&& (m.getParameters() == null ? 0 : m.getParameters().size()) == getterParams.size()) {
 						bExists = true;
 						break;
 					}
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
index c56d194..283e16e 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
@@ -204,7 +204,7 @@
 														arg = filledPath.getPathParams().get(v - 1);
 													}
 													Term condition = new Term(DataConstraintModel.eq, new Expression[] {
-															new Parameter("self" + (v > 1 ? v : "")), 
+															new Parameter("self" + (v > 1 ? v : ""), DataConstraintModel.typeString), 
 															arg});
 													if (conditions == null) {
 														conditions = condition;
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
index 0dc0551..151ab6e 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
@@ -417,7 +417,8 @@
 				for (Map.Entry<ResourceHierarchy, MethodDeclaration> entry: getters) {
 					ResourceHierarchy r = entry.getKey();
 					MethodDeclaration m = entry.getValue();
-					if (r == ancestorNode.getResourceHierarchy() && m.getName().equals(getterName) && m.getParameters().size() == pathParams.size()) {
+					if (r == ancestorNode.getResourceHierarchy() && m.getName().equals(getterName) 
+							&& (m.getParameters() == null ? 0 : m.getParameters().size()) == pathParams.size()) {
 						bExists = true;
 						break;
 					}
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
index 65d2dd7..621bd82 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
@@ -225,7 +225,7 @@
 														arg = filledPath.getPathParams().get(v - 1);
 													}
 													Term condition = new Term(DataConstraintModel.eq, new Expression[] {
-															new Parameter("self" + (v > 1 ? v : "")), 
+															new Parameter("self" + (v > 1 ? v : ""), DataConstraintModel.typeString), 
 															arg});
 													if (conditions == null) {
 														conditions = condition;