diff --git a/src/java/com/samskivert/util/ArrayIntSet.java b/src/java/com/samskivert/util/ArrayIntSet.java
index ccccee73..3dc03304 100644
--- a/src/java/com/samskivert/util/ArrayIntSet.java
+++ b/src/java/com/samskivert/util/ArrayIntSet.java
@@ -337,8 +337,8 @@ public class ArrayIntSet extends AbstractIntSet
         return h;
     }
 
-    @Override // from AbstractSet<Integer>
-    public Object clone ()
+    @Override
+    public ArrayIntSet clone ()
     {
         try {
             ArrayIntSet nset = (ArrayIntSet)super.clone();
diff --git a/src/java/com/samskivert/util/BaseArrayList.java b/src/java/com/samskivert/util/BaseArrayList.java
index aebeea02..79558b47 100644
--- a/src/java/com/samskivert/util/BaseArrayList.java
+++ b/src/java/com/samskivert/util/BaseArrayList.java
@@ -164,10 +164,10 @@ public abstract class BaseArrayList<E> extends AbstractList<E>
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    public Object clone ()
+    public BaseArrayList<E> clone ()
     {
         try {
+            @SuppressWarnings("unchecked")
             BaseArrayList<E> dup = (BaseArrayList<E>)super.clone();
             if (_elements != null) {
                 dup._elements = _elements.clone();
diff --git a/src/java/com/samskivert/util/HashIntMap.java b/src/java/com/samskivert/util/HashIntMap.java
index 1264615d..d56cf458 100644
--- a/src/java/com/samskivert/util/HashIntMap.java
+++ b/src/java/com/samskivert/util/HashIntMap.java
@@ -454,7 +454,7 @@ public class HashIntMap<V> extends AbstractMap<Integer,V>
     }
 
     @Override
-    public Object clone ()
+    public HashIntMap<V> clone ()
     {
         try {
             @SuppressWarnings("unchecked")