* Misc. fixes/updates to the TopologyElement implementation.
* Add missing TopologyElement related registrations to the Kryo serializer.
diff --git a/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java b/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java
index e0da7a8..507cb99 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java
@@ -1,6 +1,7 @@
 package net.onrc.onos.ofcontroller.util.serializers;
 
 import java.util.ArrayList;
+import java.util.TreeMap;
 
 import com.esotericsoftware.kryo2.Kryo;
 
@@ -124,6 +125,8 @@
 
 	// Topology-related classes
 	kryo.register(TopologyElement.class);
+	kryo.register(TopologyElement.Type.class);
+	kryo.register(TreeMap.class);
 
 	return kryo;
     }