diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphDatastore.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphDatastore.java
index dca4eb0..a3ab24a 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphDatastore.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphDatastore.java
@@ -92,7 +92,7 @@
 		groupOp.add(WriteOp.ForceCreate(rcSwitch));
 
 		for (PortEvent portEvent : portEvents) {
-			RCPort rcPort = new RCPort(sw.getDpid(), (long)portEvent.getNumber());
+			RCPort rcPort = new RCPort(sw.getDpid(), portEvent.getNumber());
 			rcPort.setStatus(RCPort.STATUS.INACTIVE);
 
 			groupOp.add(WriteOp.ForceCreate(rcPort));
@@ -129,10 +129,10 @@
 	 */
 	public boolean deactivatePort(PortEvent port) {
 		log.debug("Deactivating port {}", port);
-		
+
 		RCPort rcPort = new RCPort(port.getDpid(), port.getNumber());
 		rcPort.setStatus(STATUS.INACTIVE);
-		
+
 		rcPort.forceCreate();
 
 		return true;
@@ -165,7 +165,7 @@
 
 	public boolean removeLink(LinkEvent linkEvent) {
 		log.debug("Removing link {}", linkEvent);
-		
+
 		RCLink rcLink = new RCLink(linkEvent.getSrc().getDpid(), linkEvent.getSrc().getNumber(),
 				linkEvent.getDst().getDpid(), linkEvent.getDst().getNumber());
 		rcLink.forceDelete();
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
index 2153905..da4df84 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
@@ -1,7 +1,6 @@
 package net.onrc.onos.ofcontroller.networkgraph;
 
 import java.net.InetAddress;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -27,7 +26,7 @@
 
 	private ConcurrentMap<InetAddress, Set<Device>> addr2Device;
 	private ConcurrentMap<MACAddress, Device> mac2Device;
-	
+
 	private ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
 	private Lock readLock = readWriteLock.readLock();
 	// TODO use the write lock after refactor
@@ -83,9 +82,9 @@
 	    Link link = getLink(srcDpid, srcNumber);
 	    if (link == null)
 		return null;
-	    if (link.getDstSwitch().getDpid() != dstDpid)
+	    if (!link.getDstSwitch().getDpid().equals(dstDpid))
 		return null;
-	    if (link.getDstPort().getNumber() != dstNumber)
+	    if (!link.getDstPort().getNumber().equals(dstNumber))
 		return null;
 	    return link;
 	}