diff --git a/src/main/java/org/jboss/netty/channel/ChannelConfig.java b/src/main/java/org/jboss/netty/channel/ChannelConfig.java
index ffe7e84355..77707250da 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelConfig.java
@@ -70,6 +70,7 @@ import org.jboss.netty.handler.timeout.WriteTimeoutHandler;
  * @version $Rev$, $Date$
  *
  * @apiviz.has org.jboss.netty.channel.ChannelPipelineFactory
+ * @apiviz.has org.jboss.netty.channel.ReceiveBufferSizePredictor
  */
 public interface ChannelConfig {
 
diff --git a/src/main/java/org/jboss/netty/channel/Channels.java b/src/main/java/org/jboss/netty/channel/Channels.java
index 04526d8ded..da1b897d0f 100644
--- a/src/main/java/org/jboss/netty/channel/Channels.java
+++ b/src/main/java/org/jboss/netty/channel/Channels.java
@@ -56,6 +56,8 @@ import java.util.Map;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
  *
+ * @apiviz.landmark
+ *
  * @version $Rev$, $Date$
  */
 public class Channels {
diff --git a/src/main/java/org/jboss/netty/channel/ServerChannelFactory.java b/src/main/java/org/jboss/netty/channel/ServerChannelFactory.java
index 760872ec0e..4a2b5c663e 100644
--- a/src/main/java/org/jboss/netty/channel/ServerChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/ServerChannelFactory.java
@@ -30,7 +30,6 @@ package org.jboss.netty.channel;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.landmark
  * @apiviz.has        org.jboss.netty.channel.ServerChannel oneway - - creates
  */
 public interface ServerChannelFactory extends ChannelFactory {
diff --git a/src/main/java/org/jboss/netty/channel/package-info.java b/src/main/java/org/jboss/netty/channel/package-info.java
index cd0f0e2a8f..019f0ec8c4 100644
--- a/src/main/java/org/jboss/netty/channel/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/package-info.java
@@ -31,10 +31,12 @@
  * @apiviz.exclude ^org\.jboss\.netty\.channel\.[^\.]+\.
  * @apiviz.exclude ^org\.jboss\.netty\.(bootstrap|handler|util)\.
  * @apiviz.exclude \.(Abstract|Default).*$
+ * @apiviz.exclude \.(Downstream|Upstream).*Event$
  * @apiviz.exclude \.[A-Za-z]+ChannelFuture$
  * @apiviz.exclude \.ChannelPipelineFactory$
  * @apiviz.exclude \.ChannelHandlerContext$
  * @apiviz.exclude \.ChannelSink$
- * @apiviz.exclude \.[A-Za-z]*ReceiveBufferSizePredictor$
+ * @apiviz.exclude \.ChannelLocal$
+ * @apiviz.exclude \.[^\.]+ReceiveBufferSizePredictor$
  */
 package org.jboss.netty.channel;