diff --git a/cif/CIFrdcl.c b/cif/CIFrdcl.c
index 1ea50cd5..01620602 100644
--- a/cif/CIFrdcl.c
+++ b/cif/CIFrdcl.c
@@ -898,7 +898,7 @@ cifMakeBoundaryFunc(
     Rect area;
     char propertyvalue[128], *storedvalue;
     int savescale;
-    int filetype = (int)clientdata;
+    int filetype = (int)CD2INT(clientdata);
 
     TiToRect(tile, &area);
     area.r_xtop = CIFScaleCoord(area.r_xtop, COORD_EXACT);
diff --git a/debug/debugFlags.c b/debug/debugFlags.c
index d5c1bfec..95c6870e 100644
--- a/debug/debugFlags.c
+++ b/debug/debugFlags.c
@@ -121,7 +121,7 @@ DebugAddFlag(clientID, name)
 
     if (id < 0 || id >= debugNumClients)
     {
-	TxError("DebugAddFlag: bad client id %lu (flag %s)\n", clientID, name);
+	TxError("DebugAddFlag: bad client id %lu (flag %s)\n", CD2INT(clientID), name);
 	return (0);
     }
 
@@ -165,7 +165,7 @@ DebugShow(clientID)
 
     if (id < 0 || id >= debugNumClients)
     {
-	TxError("DebugShow: bad client id %lu\n", clientID);
+	TxError("DebugShow: bad client id %lu\n", CD2INT(clientID));
 	return;
     }
     dc = &debugClients[id];
diff --git a/windows/windDebug.c b/windows/windDebug.c
index feccaf59..6f0065bb 100644
--- a/windows/windDebug.c
+++ b/windows/windDebug.c
@@ -54,7 +54,7 @@ windPrintWindow(w)
     LinkedRect *lr;
 
     TxPrintf("\nWindow %d: '%s'\n", w->w_wid, w->w_caption);
-    TxPrintf("  Client %lx  Surface %lx \n", w->w_client, w->w_surfaceID);
+    TxPrintf("  Client %lx  Surface %lx \n", w->w_client, CD2INT(w->w_surfaceID));
 
     TxPrintf("  All area (%d, %d) (%d, %d)\n",
 	w->w_allArea.r_xbot, w->w_allArea.r_ybot,