diff --git a/src/main/java/com/threerings/presents/dobj/EntryAddedEvent.java b/src/main/java/com/threerings/presents/dobj/EntryAddedEvent.java
index ec812c775..153934e42 100644
--- a/src/main/java/com/threerings/presents/dobj/EntryAddedEvent.java
+++ b/src/main/java/com/threerings/presents/dobj/EntryAddedEvent.java
@@ -112,7 +112,7 @@ public class EntryAddedEvent<T extends DSet.Entry> extends EntryEvent<T>
     }
 
     /** Used by {@link DObject} to note if this event has already been applied locally. */
-    protected EntryAddedEvent setAlreadyApplied (boolean alreadyApplied)
+    protected EntryAddedEvent<T> setAlreadyApplied (boolean alreadyApplied)
     {
         _alreadyApplied = alreadyApplied;
         return this;
diff --git a/src/main/java/com/threerings/presents/dobj/EntryRemovedEvent.java b/src/main/java/com/threerings/presents/dobj/EntryRemovedEvent.java
index d1f018c31..fc7091bfe 100644
--- a/src/main/java/com/threerings/presents/dobj/EntryRemovedEvent.java
+++ b/src/main/java/com/threerings/presents/dobj/EntryRemovedEvent.java
@@ -115,7 +115,7 @@ public class EntryRemovedEvent<T extends DSet.Entry> extends EntryEvent<T>
         buf.append(", key=").append(_key);
     }
 
-    protected EntryRemovedEvent setOldEntry (T oldEntry)
+    protected EntryRemovedEvent<T> setOldEntry (T oldEntry)
     {
         _oldEntry = oldEntry;
         return this;
diff --git a/src/main/java/com/threerings/presents/dobj/EntryUpdatedEvent.java b/src/main/java/com/threerings/presents/dobj/EntryUpdatedEvent.java
index 9f7ac1818..932653b15 100644
--- a/src/main/java/com/threerings/presents/dobj/EntryUpdatedEvent.java
+++ b/src/main/java/com/threerings/presents/dobj/EntryUpdatedEvent.java
@@ -118,7 +118,7 @@ public class EntryUpdatedEvent<T extends DSet.Entry> extends EntryEvent<T>
         StringUtil.toString(buf, _entry);
     }
 
-    protected EntryUpdatedEvent setOldEntry (T oldEntry)
+    protected EntryUpdatedEvent<T> setOldEntry (T oldEntry)
     {
         _oldEntry = oldEntry;
         return this;
diff --git a/src/main/java/com/threerings/presents/tools/InvocationTask.java b/src/main/java/com/threerings/presents/tools/InvocationTask.java
index 11325a5d2..aa38b8e92 100644
--- a/src/main/java/com/threerings/presents/tools/InvocationTask.java
+++ b/src/main/java/com/threerings/presents/tools/InvocationTask.java
@@ -340,7 +340,7 @@ public abstract class InvocationTask extends GenTask
 
         protected void collectTypeParams (Type type, List<String> params) {
             if (type instanceof TypeVariable) {
-                String tvar = ((TypeVariable)type).getName();
+                String tvar = ((TypeVariable<?>)type).getName();
                 if (!params.contains(tvar)) params.add(tvar);
             } else if (type instanceof ParameterizedType) {
                 for (Type pt : ((ParameterizedType)type).getActualTypeArguments()) {