diff --git a/src/java/com/threerings/media/AbstractMedia.java b/src/java/com/threerings/media/AbstractMedia.java
index f3d179c5..bbcd6610 100644
--- a/src/java/com/threerings/media/AbstractMedia.java
+++ b/src/java/com/threerings/media/AbstractMedia.java
@@ -41,9 +41,8 @@ import static com.threerings.media.Log.log;
 public abstract class AbstractMedia
     implements Shape
 {
-    /** A {@link #_renderOrder} value at or above which, indicates that this
-     * media is in the HUD (heads up display) and should not scroll when the
-     * view scrolls. */
+    /** A {@link #_renderOrder} value at or above which, indicates that this media is in the HUD
+     * (heads up display) and should not scroll when the view scrolls. */
     public static final int HUD_LAYER = 65536;
 
     /**
@@ -348,7 +347,7 @@ public abstract class AbstractMedia
     /**
      * "Naturally" compares this media with the specified other media (which by definition will
      * have the same render order value). The default behavior, for legacy reasons, is to compare
-     * using {@link #hashCode} which is not consistent across VM invocations.
+     * using {@link Object#hashCode} which is not consistent across VM invocations.
      */
     protected int naturalCompareTo (AbstractMedia other)
     {
diff --git a/src/java/com/threerings/media/AbstractMediaManager.java b/src/java/com/threerings/media/AbstractMediaManager.java
index 12fb8617..35a8a4f0 100644
--- a/src/java/com/threerings/media/AbstractMediaManager.java
+++ b/src/java/com/threerings/media/AbstractMediaManager.java
@@ -21,20 +21,19 @@
 
 package com.threerings.media;
 
+import static com.threerings.resource.Log.log;
+
+import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Shape;
-
 import java.util.Comparator;
 import java.util.List;
 
 import com.google.common.collect.Lists;
-
-import com.samskivert.util.SortableArrayList;
-import com.samskivert.util.ObserverList.ObserverOp;
 import com.samskivert.util.ObserverList;
+import com.samskivert.util.SortableArrayList;
 import com.samskivert.util.Tuple;
-
-import static com.threerings.resource.Log.log;
+import com.samskivert.util.ObserverList.ObserverOp;
 
 /**
  * Manages, ticks, and paints {@link AbstractMedia}.
@@ -61,7 +60,7 @@ public abstract class AbstractMediaManager
 
     /**
      * Creates a graphics that can be used to compute metrics or whatever else a media might need.
-     * The caller should call {@link Graphics2D#dispose} on the returned object when it is done
+     * The caller should call {@link Graphics#dispose} on the returned object when it is done
      * with it.
      */
     public Graphics2D createGraphics ()
@@ -167,11 +166,11 @@ public abstract class AbstractMediaManager
             log.warning("Egads! Render order changed during a tick.");
             Thread.dumpStack();
         }
-        
+
         _media.remove(media);
         _media.insertSorted(media, RENDER_ORDER);
     }
-    
+
     /**
      * Calls {@link AbstractMedia#tick} on all media to give them a chance to move about, change
      * their look, generate dirty regions, and so forth.