diff --git a/apps/mappingmanagement/web/src/test/java/org/onosproject/mapping/web/MappingsWebResourceTest.java b/apps/mappingmanagement/web/src/test/java/org/onosproject/mapping/web/MappingsWebResourceTest.java
index f149906..ffbd434 100644
--- a/apps/mappingmanagement/web/src/test/java/org/onosproject/mapping/web/MappingsWebResourceTest.java
+++ b/apps/mappingmanagement/web/src/test/java/org/onosproject/mapping/web/MappingsWebResourceTest.java
@@ -135,7 +135,7 @@
      * Mock class for a mapping entry.
      */
     private static class MockMappingEntry implements MappingEntry {
-        final short UNIQUE_SHORT = 2;
+        static final short UNIQUE_SHORT = 2;
         final DeviceId deviceId;
         MappingKey key;
         MappingValue value;
diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java
index 9b4d7fc..c03a6a4 100644
--- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java
+++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java
@@ -307,8 +307,8 @@
         }
     }
 
-    //Listener for closed session with devices, gets triggered whe devices goes down
-    // or sends the endpattern ]]>]]>
+    //Listener for closed session with devices, gets triggered when devices goes down
+    // or sends the end pattern ]]>]]>
     private class DeviceDownEventListener implements NetconfDeviceOutputEventListener {
 
         @Override