diff --git a/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/interceptors/WebServiceOutgoingCallInterceptor.java b/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/interceptors/WebServiceOutgoingCallInterceptor.java
index 7bcc80184ded7ef76f83eed974ff1b624e23c2c4..34a85ed4529b74d418b12d443ba14b06a79ddb4b 100644
--- a/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/interceptors/WebServiceOutgoingCallInterceptor.java
+++ b/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/interceptors/WebServiceOutgoingCallInterceptor.java
@@ -31,8 +31,6 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Deque;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.xml.namespace.QName;
 import javax.xml.ws.handler.MessageContext;
 
 import org.jboss.logging.Logger;
@@ -67,7 +65,8 @@ public class WebServiceOutgoingCallInterceptor extends GenericSOAPHandler {
 					application = componentName.substring(0, idx - 1);
 					componentName = componentName.substring(idx);
 				}
-				ComponentRecord component = MonitoringService.INSTANCE.requireComponent(url.getHost(), application, "", componentName);
+				ComponentRecord component = MonitoringService.INSTANCE
+						.requireComponent(url.getHost() + ":" + url.getPort(), application, "", componentName);
 				OperationRecord currentOperation = currentInvocation.requireEndpoint(component, caller.getDeclaringClass().getName(), "http", caller.getName());
 				// TODO: We currently support only one-way messages. Inbound messages are ignored.
 				InvocationRecord outgoingInvocation = currentOperation.startInvocation();
diff --git a/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java b/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java
index 2fb760adc02c250ae99b3af1cf3ef73588cb5c78..9ad9a2b519e84a83fcd1b9cf985ca78f095b0ed0 100644
--- a/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java
+++ b/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java
@@ -504,7 +504,7 @@ public class ModelExtractionService extends AgentController implements Service<M
 
 			InterfaceRequiringRole remoteRequiringRole = null;
 			if (callerRequiringRole != null) {
-				if (differentModule) {
+				if (differentModule || (systemRequiringRole != null)) {
 					// Only add a interface requiring role to the composite
 					// component if it is a remote call, i.e., a call to another
 					// composite component.
@@ -550,7 +550,7 @@ public class ModelExtractionService extends AgentController implements Service<M
 
 		// 7. Now create the assembly contexts
 		AssemblyContext callerContext = addAssemblyContext(skeleton.getSystem(), incomingCrec, callerComponent);
-		if (calledComponent != null) {
+		if (calledComponent != null && differentModule) {
 			AssemblyContext calledContext = addAssemblyContext(skeleton.getSystem(), outgoingCrec, calledComponent);
 
 			AssemblyConnector connector = RepositoryFactory.eINSTANCE.createAssemblyConnector();