diff --git a/src/java/com/threerings/media/tile/TileManager.java b/src/java/com/threerings/media/tile/TileManager.java
index ae8eabdfe..07b9d7b64 100644
--- a/src/java/com/threerings/media/tile/TileManager.java
+++ b/src/java/com/threerings/media/tile/TileManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: TileManager.java,v 1.15 2001/08/16 23:14:20 mdb Exp $
+// $Id: TileManager.java,v 1.16 2001/09/17 05:18:21 mdb Exp $
 
 package com.threerings.media.tile;
 
@@ -7,7 +7,7 @@ import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 
-import com.samskivert.util.IntMap;
+import com.samskivert.util.HashIntMap;
 
 import com.threerings.media.Log;
 
@@ -70,7 +70,7 @@ public class TileManager
     }
 
     /** Cache of tiles that have been requested thus far. */
-    protected IntMap _tiles = new IntMap();
+    protected HashIntMap _tiles = new HashIntMap();
 
     /** The tileset manager. */
     protected TileSetManager _tilesetmgr;
diff --git a/src/java/com/threerings/media/tile/TileSetManagerImpl.java b/src/java/com/threerings/media/tile/TileSetManagerImpl.java
index a71da4f8b..d2e4a1bdd 100644
--- a/src/java/com/threerings/media/tile/TileSetManagerImpl.java
+++ b/src/java/com/threerings/media/tile/TileSetManagerImpl.java
@@ -1,5 +1,5 @@
 //
-// $Id: TileSetManagerImpl.java,v 1.11 2001/08/16 23:17:46 mdb Exp $
+// $Id: TileSetManagerImpl.java,v 1.12 2001/09/17 05:18:21 mdb Exp $
 
 package com.threerings.media.tile;
 
@@ -63,5 +63,5 @@ public abstract class TileSetManagerImpl implements TileSetManager
     protected ImageManager _imgmgr;
 
     /** The available tilesets keyed by tileset id. */
-    protected IntMap _tilesets = new IntMap();
+    protected HashIntMap _tilesets = new HashIntMap();
 }
diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/java/com/threerings/presents/client/ClientDObjectMgr.java
index be8be5772..b9e4bee8e 100644
--- a/src/java/com/threerings/presents/client/ClientDObjectMgr.java
+++ b/src/java/com/threerings/presents/client/ClientDObjectMgr.java
@@ -1,10 +1,10 @@
 //
-// $Id: ClientDObjectMgr.java,v 1.5 2001/08/07 20:38:58 mdb Exp $
+// $Id: ClientDObjectMgr.java,v 1.6 2001/09/17 05:18:20 mdb Exp $
 
 package com.threerings.cocktail.cher.client;
 
 import java.util.ArrayList;
-import com.samskivert.util.IntMap;
+import com.samskivert.util.HashIntMap;
 import com.samskivert.util.Queue;
 
 import com.threerings.cocktail.cher.Log;
@@ -331,8 +331,8 @@ public class ClientDObjectMgr
      * This table contains all of the distributed objects that are active
      * on this client.
      */
-    protected IntMap _ocache = new IntMap();
+    protected HashIntMap _ocache = new HashIntMap();
 
     /** This table contains pending subscriptions. */
-    protected IntMap _penders = new IntMap();
+    protected HashIntMap _penders = new HashIntMap();
 }
diff --git a/src/java/com/threerings/presents/io/ValueMarshaller.java b/src/java/com/threerings/presents/io/ValueMarshaller.java
index 94dd01fe5..7da2f9719 100644
--- a/src/java/com/threerings/presents/io/ValueMarshaller.java
+++ b/src/java/com/threerings/presents/io/ValueMarshaller.java
@@ -1,12 +1,12 @@
 //
-// $Id: ValueMarshaller.java,v 1.2 2001/08/09 00:59:53 mdb Exp $
+// $Id: ValueMarshaller.java,v 1.3 2001/09/17 05:18:21 mdb Exp $
 
 package com.threerings.cocktail.cher.dobj.io;
 
 import java.io.*;
 import java.util.HashMap;
 
-import com.samskivert.util.IntMap;
+import com.samskivert.util.HashIntMap;
 
 /**
  * The value marshaller provides a mechanism for marshalling and
@@ -483,7 +483,7 @@ public class ValueMarshaller
     }
 
     protected static HashMap _outmap = new HashMap();
-    protected static IntMap _inmap = new IntMap();
+    protected static HashIntMap _inmap = new HashIntMap();
 
     protected static Class[] _classes = {
         Byte.class,