diff --git a/docs/internal-apis b/docs/internal-apis
index 9d8079a5bb..a35d093c10 100644
--- a/docs/internal-apis
+++ b/docs/internal-apis
@@ -1,4 +1,2 @@
 org.onosproject
 org.onosproject.*
-org.onosproject.rest
-org.onosproject.security
diff --git a/docs/internal-core b/docs/internal-core
index 8f24282254..39b42da4c3 100644
--- a/docs/internal-core
+++ b/docs/internal-core
@@ -1,7 +1,27 @@
-*.impl
-*.impl.*
-
+org.onosproject.cfg.impl
+org.onosproject.cluster.impl
+org.onosproject.core.impl
+org.onosproject.event.impl
+org.onosproject.net.config.impl
+org.onosproject.net.device.impl
+org.onosproject.net.driver.impl
+org.onosproject.net.edgeservice.impl
+org.onosproject.net.flow.impl
+org.onosproject.net.flowobjective.impl
+org.onosproject.net.flowobjective.impl.composition
+org.onosproject.net.group.impl
+org.onosproject.net.host.impl
+org.onosproject.net.intent.impl
+org.onosproject.net.intent.impl.compiler
+org.onosproject.net.intent.impl.phase
+org.onosproject.net.link.impl
+org.onosproject.net.newresource.impl
+org.onosproject.net.packet.impl
+org.onosproject.net.proxyarp.impl
+org.onosproject.net.resource.impl
+org.onosproject.net.statistic.impl
+org.onosproject.net.topology.impl
 org.onosproject.json
 org.onosproject.json.*
-:org.onosproject.common.*
-org.onosproject.security.*
+org.onosproject.common.*
+org.onosproject.security.impl
diff --git a/docs/internal-incubator b/docs/internal-incubator
index 619bbb9000..58179b6834 100644
--- a/docs/internal-incubator
+++ b/docs/internal-incubator
@@ -7,3 +7,7 @@ org.onosproject.incubator.store.tunnel.impl
 org.onosproject.incubator.net.config.impl
 org.onosproject.incubator.net.domain.impl
 org.onosproject.incubator.store.config.impl
+org.onosproject.incubator.net.intf.impl
+org.onosproject.incubator.net.meter.impl
+org.onosproject.incubator.net.resource.label
+org.onosproject.incubator.store.meter.impl
\ No newline at end of file
diff --git a/utils/misc/src/main/java/org/onlab/packet/PIM.java b/utils/misc/src/main/java/org/onlab/packet/PIM.java
index cab95142bd..d306263bd8 100755
--- a/utils/misc/src/main/java/org/onlab/packet/PIM.java
+++ b/utils/misc/src/main/java/org/onlab/packet/PIM.java
@@ -101,7 +101,7 @@ public class PIM extends BasePacket {
     /**
      * Set the PIM version type. Should not change from 2.
      *
-     * @param version
+     * @param version PIM version
      */
     public void setVersion(byte version) {
          this.version = version;
diff --git a/utils/misc/src/main/java/org/onlab/packet/pim/PIMAddrGroup.java b/utils/misc/src/main/java/org/onlab/packet/pim/PIMAddrGroup.java
index 195dc921bc..891a019397 100644
--- a/utils/misc/src/main/java/org/onlab/packet/pim/PIMAddrGroup.java
+++ b/utils/misc/src/main/java/org/onlab/packet/pim/PIMAddrGroup.java
@@ -78,7 +78,7 @@ public class PIMAddrGroup {
     /**
      * Set the encoded source address.
      *
-     * @param pfx
+     * @param pfx address prefix
      */
     public void setAddr(IpPrefix pfx) {
         this.addr = pfx.address();
@@ -145,7 +145,7 @@ public class PIMAddrGroup {
     /**
      * Serialize this group address.
      *
-     * @return the serialized address in a buffer.
+     * @return the serialized address in a buffer
      */
     public byte[] serialize() {
         int len = getByteSize();
@@ -168,7 +168,8 @@ public class PIMAddrGroup {
      * Deserialze from a ByteBuffer.
      *
      * @param bb the ByteBuffer
-     * @return an encoded PIM group address.
+     * @return an encoded PIM group address
+     * @throws DeserializationException if unable to deserialize the packet data
      */
     public PIMAddrGroup deserialize(ByteBuffer bb) throws DeserializationException {