diff --git a/ce-api/src/main/java/org/opencord/ce/api/models/codecs/ForwardingConstructCodec.java b/ce-api/src/main/java/org/opencord/ce/api/models/codecs/ForwardingConstructCodec.java
index 3c633fc..092726c 100644
--- a/ce-api/src/main/java/org/opencord/ce/api/models/codecs/ForwardingConstructCodec.java
+++ b/ce-api/src/main/java/org/opencord/ce/api/models/codecs/ForwardingConstructCodec.java
@@ -50,7 +50,7 @@
                 .put(FC_ID, fc.id().id())
                 .put(CFG_ID, fc.cfgId())
                 .put(TYPE, fc.type().toString())
-                .put(STATE, fc.type().toString())
+                .put(STATE, fc.state().toString())
                 .put(MAX_LATENCY, fc.maxLatency().toString());
         result.put(VLAN_ID, fc.vlanId().toShort());
         ArrayNode ltpsNode = context.mapper().createArrayNode();
diff --git a/local/bigswitch/src/main/java/org/opencord/ce/local/bigswitch/cli/ConnectPointFromVirtPortCmd.java b/local/bigswitch/src/main/java/org/opencord/ce/local/bigswitch/cli/ConnectPointFromVirtPortCmd.java
index b94fec5..4b6631a 100644
--- a/local/bigswitch/src/main/java/org/opencord/ce/local/bigswitch/cli/ConnectPointFromVirtPortCmd.java
+++ b/local/bigswitch/src/main/java/org/opencord/ce/local/bigswitch/cli/ConnectPointFromVirtPortCmd.java
@@ -28,7 +28,7 @@
         "associated with the specified virtual port of the bigswitch")
 public class ConnectPointFromVirtPortCmd extends AbstractShellCommand {
 
-    @Argument(index = 1, name = "port",
+    @Argument(name = "port",
             description = "Virtual bigswitch port",
             required = true, multiValued = false)
     String port = "0";
diff --git a/local/http-channel/src/main/java/org/opencord/ce/local/channel/server/MetroNetworkResource.java b/local/http-channel/src/main/java/org/opencord/ce/local/channel/server/MetroNetworkResource.java
index 3d194da..f860bf7 100644
--- a/local/http-channel/src/main/java/org/opencord/ce/local/channel/server/MetroNetworkResource.java
+++ b/local/http-channel/src/main/java/org/opencord/ce/local/channel/server/MetroNetworkResource.java
@@ -165,7 +165,7 @@
     @Path("deleteFcResources/{fcId}")
     @Produces(MediaType.APPLICATION_JSON)
     @DELETE
-    public Response removeAllForwardingResources(@PathParam("{fcId}") String fcId) {
+    public Response removeAllForwardingResources(@PathParam("fcId") String fcId) {
         EvcConnId evcId = EvcConnId.of(fcId);
         MetroNetworkVirtualNodeService localNodeService =
                 get(MetroNetworkVirtualNodeService.class);