diff --git a/core/api/src/main/java/org/onlab/onos/codec/CodecService.java b/core/api/src/main/java/org/onlab/onos/codec/CodecService.java
index 100a28c..5f456f8 100644
--- a/core/api/src/main/java/org/onlab/onos/codec/CodecService.java
+++ b/core/api/src/main/java/org/onlab/onos/codec/CodecService.java
@@ -43,6 +43,7 @@
      *
      * @param entityClass entity class
      * @param codec       JSON codec
+     * @param <T>         entity type
      */
     <T> void registerCodec(Class<T> entityClass, JsonCodec<T> codec);
 
diff --git a/core/api/src/main/java/org/onlab/onos/net/DeviceId.java b/core/api/src/main/java/org/onlab/onos/net/DeviceId.java
index e1080f2..f76b6b8 100644
--- a/core/api/src/main/java/org/onlab/onos/net/DeviceId.java
+++ b/core/api/src/main/java/org/onlab/onos/net/DeviceId.java
@@ -34,7 +34,7 @@
     // Public construction is prohibited
     private DeviceId(URI uri) {
         this.uri = uri;
-        this.str = uri.toString();
+        this.str = uri.toString().toLowerCase();
     }
 
 
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/DatabaseService.java b/core/api/src/main/java/org/onlab/onos/store/service/DatabaseService.java
index 2779fe6..a82bd70 100644
--- a/core/api/src/main/java/org/onlab/onos/store/service/DatabaseService.java
+++ b/core/api/src/main/java/org/onlab/onos/store/service/DatabaseService.java
@@ -9,8 +9,8 @@
     /**
      * Reads the specified key.
      * @param tableName name of the table associated with this operation.
-     * @return key key to read.
-     * @returns value (and version) associated with this key. This calls returns null if the key does not exist.
+     * @param key key to read.
+     * @return value (and version) associated with this key. This calls returns null if the key does not exist.
      */
     VersionedValue get(String tableName, String key);