diff --git a/src/main/java/org/jboss/netty/channel/ChannelLocal.java b/src/main/java/org/jboss/netty/channel/ChannelLocal.java
index ea0fbe54a2..c8291e48a8 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelLocal.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelLocal.java
@@ -30,6 +30,8 @@ import org.jboss.netty.util.ConcurrentWeakHashMap;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
  * @version $Rev$, $Date$
+ *
+ * @apiviz.stereotype utility
  */
 public class ChannelLocal<T> {
     private final ConcurrentMap<Channel, T> map = new ConcurrentWeakHashMap<Channel, T>();
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/QueryStringDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/QueryStringDecoder.java
index 87e55e6e18..73208867da 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/QueryStringDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/QueryStringDecoder.java
@@ -31,6 +31,8 @@ import java.util.Map;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Andy Taylor (andy.taylor@jboss.org)
  * @version $Rev$, $Date$
+ *
+ * @apiviz.stereotype utility
  */
 public class QueryStringDecoder {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/QueryStringEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/QueryStringEncoder.java
index bba24c7fbe..c53979f5e7 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/QueryStringEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/QueryStringEncoder.java
@@ -30,6 +30,8 @@ import java.util.List;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Andy Taylor (andy.taylor@jboss.org)
  * @version $Rev$, $Date$
+ *
+ * @apiviz.stereotype utility
  */
 public class QueryStringEncoder {
 
diff --git a/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java b/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
index e31213eb17..01c8c57538 100644
--- a/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
+++ b/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
@@ -79,7 +79,6 @@ import org.jboss.netty.util.LinkedTransferQueue;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.landmark
  * @apiviz.uses org.jboss.netty.handler.execution.ObjectSizeEstimator
  * @apiviz.uses org.jboss.netty.handler.execution.ChannelEventRunnable
  */
diff --git a/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java b/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
index 27f812732f..edc8bba94f 100644
--- a/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
+++ b/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
@@ -58,6 +58,7 @@ import org.jboss.netty.channel.ChannelEvent;
  *
  * @version $Rev$, $Date$
  *
+ * @apiviz.landmark
  */
 public class OrderedMemoryAwareThreadPoolExecutor extends
         MemoryAwareThreadPoolExecutor {