diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/TunnelPolicy.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/TunnelPolicy.java
index c96c1f99ec..134828b3d4 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/TunnelPolicy.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/TunnelPolicy.java
@@ -27,6 +27,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
  */
 public final class TunnelPolicy implements Policy {
 
+    // FIXME: We should avoid passing around references to implementation objects
+    // Instead, if some operational context is required, we should abstract it to
+    // a bare minimum.
     private final SegmentRoutingManager srManager;
     private final Type type;
     private final String id;
@@ -61,6 +64,7 @@ public final class TunnelPolicy implements Policy {
     /**
      * Creates a TunnelPolicy reference.
      *
+     * @param srm reference to the segment routing component
      * @param p TunnelPolicy reference
      */
     public TunnelPolicy(SegmentRoutingManager srm, TunnelPolicy p) {
diff --git a/utils/misc/src/main/java/org/onlab/util/Frequency.java b/utils/misc/src/main/java/org/onlab/util/Frequency.java
index 19c7900304..5669abdc89 100644
--- a/utils/misc/src/main/java/org/onlab/util/Frequency.java
+++ b/utils/misc/src/main/java/org/onlab/util/Frequency.java
@@ -141,7 +141,7 @@ public final class Frequency implements RichComparable<Frequency> {
     /**
      * Returns a Frequency whose value is Math.floorDiv(this, value).
      *
-     * @param value
+     * @param value value to be divided by this Frequency
      * @return Math.floorDiv(this, value)
      */
     public Frequency floorDivision(long value) {
diff --git a/utils/nio/src/main/java/org/onlab/nio/service/IOLoopMessaging.java b/utils/nio/src/main/java/org/onlab/nio/service/IOLoopMessaging.java
index 70f2f768ca..69b312a0dd 100644
--- a/utils/nio/src/main/java/org/onlab/nio/service/IOLoopMessaging.java
+++ b/utils/nio/src/main/java/org/onlab/nio/service/IOLoopMessaging.java
@@ -100,6 +100,7 @@ public class IOLoopMessaging implements MessagingService {
     /**
      * Activates IO Loops.
      *
+     * @param localEp local end-point
      * @throws IOException is activation fails
      */
     public void start(Endpoint localEp) throws IOException {