diff --git a/src/java/com/samskivert/jdbc/jora/Table.java b/src/java/com/samskivert/jdbc/jora/Table.java
index b4c6d59b..4d737b42 100644
--- a/src/java/com/samskivert/jdbc/jora/Table.java
+++ b/src/java/com/samskivert/jdbc/jora/Table.java
@@ -252,7 +252,7 @@ public class Table<T>
 
     /**
      * Returns a field mask that can be configured and used to update subsets
-     * of entire objects via calls to {@link #update(T,FieldMask)}.
+     * of entire objects via calls to {@link #update(Connection,T,FieldMask)}.
      */
     public FieldMask getFieldMask ()
     {
diff --git a/src/java/com/samskivert/swing/AWTResultListener.java b/src/java/com/samskivert/swing/AWTResultListener.java
index e5d1a3b3..5ee01a93 100644
--- a/src/java/com/samskivert/swing/AWTResultListener.java
+++ b/src/java/com/samskivert/swing/AWTResultListener.java
@@ -11,19 +11,19 @@ import com.samskivert.util.ResultListener;
  * Dispatches a {@link ResultListener}'s callbacks on the AWT thread
  * regardless of what thread on which they were originally dispatched.
  */
-public class AWTResultListener implements ResultListener
+public class AWTResultListener<T> implements ResultListener<T>
 {
     /**
      * Creates an AWT result listener that will dispatch results to the
      * supplied target.
      */
-    public AWTResultListener (ResultListener target)
+    public AWTResultListener (ResultListener<T> target)
     {
         _target = target;
     }
 
     // documentation inherited from interface
-    public void requestCompleted (final Object result)
+    public void requestCompleted (final T result)
     {
         EventQueue.invokeLater(new Runnable() {
             public void run () {
@@ -43,5 +43,5 @@ public class AWTResultListener implements ResultListener
     }
 
     /** The result listener for which we are proxying. */
-    protected ResultListener _target;
+    protected ResultListener<T> _target;
 }
diff --git a/src/java/com/samskivert/util/ObserverList.java b/src/java/com/samskivert/util/ObserverList.java
index 6736271d..c84d0c21 100644
--- a/src/java/com/samskivert/util/ObserverList.java
+++ b/src/java/com/samskivert/util/ObserverList.java
@@ -175,6 +175,7 @@ public class ObserverList<T> extends ArrayList<T>
      * list in a manner conforming to the notification ordering policy
      * specified at construct time.
      */
+    @SuppressWarnings("unchecked")
     public void apply (ObserverOp<T> obop)
     {
         if (_policy == SAFE_IN_ORDER_NOTIFY) {
@@ -184,11 +185,11 @@ public class ObserverList<T> extends ArrayList<T>
             // array during notification don't hose us
             int ocount = size();
             if (_snap == null || _snap.length < ocount) {
-                _snap = new Object[ocount];
+                _snap = (T[])new Object[ocount];
             }
             Object[] obs = toArray(_snap);
             for (int ii = 0; ii < ocount; ii++) {
-                if (!checkedApply(obop, (T)_snap[ii])) {
+                if (!checkedApply(obop, _snap[ii])) {
                     remove(_snap[ii]);
                 }
             }
@@ -231,7 +232,7 @@ public class ObserverList<T> extends ArrayList<T>
 
     /** Used to avoid creating a new snapshot array every time we notify
      * our observers if the size has not changed. */
-    protected Object[] _snap;
+    protected T[] _snap;
 
     /** Message reported for unsupported <code>add()</code> variants. */
     protected static final String UNSUPPORTED_ADD_MESSAGE =