diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
index 3e51bb5..ef1c564 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
@@ -371,7 +371,8 @@
 		}
 	}
 
-	protected void fillDescendantGetterMethod(MethodDeclaration descendantGetter, ResourceHierarchy descendant, ResourceHierarchy ancestor, TypeDeclaration ancestorComponent, ILanguageSpecific langSpec) {
+	protected void fillDescendantGetterMethod(MethodDeclaration descendantGetter, ResourceHierarchy descendant, 
+			ResourceHierarchy child, ResourceHierarchy ancestor, TypeDeclaration ancestorComponent, ILanguageSpecific langSpec) {
 		// (#4) descendant getter method (the implementation must be kept consistent with #3)
 		Expression selector;
 		if (DataConstraintModel.typeList.isAncestorOf(ancestor.getResourceStateType())) {
@@ -379,7 +380,7 @@
 		} else if (DataConstraintModel.typeMap.isAncestorOf(ancestor.getResourceStateType())) {
 			selector = new Variable(langSpec.getFieldAccessor(fieldOfResourceState));
 		} else {
-			String fieldName = langSpec.toVariableName(getComponentName(descendant, langSpec));
+			String fieldName = langSpec.toVariableName(getComponentName(child, langSpec));
 			selector = new Variable(langSpec.getFieldAccessor(fieldName));
 		}
 		if (descendantGetter.getParameters() != null) {
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index 7513d41..fd19c1a 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -263,7 +263,7 @@
 											((Variable) param).setType(var.getType());
 										}
 									}
-									params.add(param.toImplementation(new String[] {""}));
+									params.add(param.toImplementation(null));
 								} else {
 									params.add(var.getName());
 								}
@@ -679,9 +679,11 @@
 	private MethodDeclaration declareStateGetterMethodInAncestor(ResourceNode resourceNode, Map<ResourceHierarchy, TypeDeclaration> resourceComponents, Type resStateType, ILanguageSpecific langSpec) {
 		// Search an ancestor in which the getter method is declared.
 		ResourceNode ancestorNode = resourceNode;
+		ResourceNode childNode = null;
 		Stack<ResourceNode> ancestors = new Stack<>();
 		do {
 			ancestors.push(ancestorNode);
+			childNode = ancestorNode;
 			ancestorNode = ancestorNode.getParent();
 		} while (!generatesComponent(ancestorNode.getResourceHierarchy()));
 		TypeDeclaration ancestorComponent = resourceComponents.get(ancestorNode.getResourceHierarchy());
@@ -718,7 +720,7 @@
 		}
 		
 		if (((StoreAttribute) resourceNode.getAttribute()).isStored()) {
-			fillDescendantGetterMethod(stateGetter, resourceNode.getResourceHierarchy(), ancestorNode.getResourceHierarchy(), ancestorComponent, langSpec);
+			fillDescendantGetterMethod(stateGetter, resourceNode.getResourceHierarchy(), childNode.getResourceHierarchy(), ancestorNode.getResourceHierarchy(), ancestorComponent, langSpec);
 		} else {	
 			addOtherGetterInvocationsToStateGatter(stateGetter, resourceNode, langSpec);
 		}
@@ -819,7 +821,7 @@
 							descendantGetter = langSpec.newMethodDeclaration(getterPrefix + descendantCompName, false, descendantType, params);
 						}
 						
-						fillDescendantGetterMethod(descendantGetter, descendant.getResourceHierarchy(), resourceNode.getResourceHierarchy(), component, langSpec);
+						fillDescendantGetterMethod(descendantGetter, descendant.getResourceHierarchy(), child.getResourceHierarchy(), resourceNode.getResourceHierarchy(), component, langSpec);
 						component.addMethod(descendantGetter);
 					}
 					break;
@@ -1063,8 +1065,8 @@
 					}
 					
 					// Declare the field to cache the state of the source resource in the type of the destination resource.
-					if (resToCh.getDestination().getIndegree() > 1 
-							|| (resToCh.getDestination().getIndegree() == 1 && ch.getInputChannelMembers().iterator().next().getStateTransition().isRightPartial())) {
+					if (resToCh.getDestination().getIndegree() + ch.getInputChannelMembers().size() > 1
+							|| (ch.getInputChannelMembers().size() == 1 && ch.getInputChannelMembers().iterator().next().getStateTransition().isRightPartial())) {
 						// If incoming edges are multiple, or the current state of an input member is needed.
 						if (langSpec.declareField()) {
 							// Declare the cache field.