diff --git a/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackPort.java b/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackPort.java
index 6594e61..58ac583 100644
--- a/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackPort.java
+++ b/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackPort.java
@@ -353,7 +353,7 @@
          */
         public OpenstackPort build() {
             return new OpenstackPort(status, name, allowedAddressPairs, adminStateUp,
-                                     networkId, networkId, deviceOwner, macAddress, fixedIps,
+                                     networkId, tenantId, deviceOwner, macAddress, fixedIps,
                                      id, securityGroups, deviceId);
         }
     }
diff --git a/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackSecurityGroupRule.java b/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackSecurityGroupRule.java
index 15fdcd9..8436750 100644
--- a/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackSecurityGroupRule.java
+++ b/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackSecurityGroupRule.java
@@ -189,7 +189,7 @@
             return true;
         }
 
-        if (this instanceof OpenstackSecurityGroupRule) {
+        if (o instanceof OpenstackSecurityGroupRule) {
             OpenstackSecurityGroupRule that = (OpenstackSecurityGroupRule) o;
             return this.direction.equals(that.direction) &&
                     this.ethertype.equals(that.ethertype) &&