diff --git a/ChangeLog b/ChangeLog
index 6919fa6d9..9fde6f57b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-01  Eric Anholt  <anholt@FreeBSD.org>
+
+	* exa/exa_accel.c: (exaCopyWindow):
+	* hw/kdrive/ephyr/ephyr_draw.c: (ephyrFinishPipelinedAccess),
+	(ephyrUploadToScreen):
+	Clean up warnings and a debug printf.
+
 2006-04-01  Eric Anholt  <anholt@FreeBSD.org>
 
 	* exa/exa.c: (exaValidateGC):
diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 1978852b6..b51cd87dd 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -822,7 +822,6 @@ const GCOps exaOps = {
 void
 exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {
-    ExaScreenPriv (pWin->drawable.pScreen);
     RegionRec	rgnDst;
     int		dx, dy;
     PixmapPtr	pPixmap = (*pWin->drawable.pScreen->GetWindowPixmap) (pWin);
diff --git a/hw/kdrive/ephyr/ephyr_draw.c b/hw/kdrive/ephyr/ephyr_draw.c
index b155c6f6e..68ffa9ef3 100644
--- a/hw/kdrive/ephyr/ephyr_draw.c
+++ b/hw/kdrive/ephyr/ephyr_draw.c
@@ -81,7 +81,6 @@ ephyrFinishPipelinedAccess(PixmapPtr pPix, int index)
     KdScreenInfo *screen = pScreenPriv->screen;
     EphyrScrPriv *scrpriv = screen->driver;
     EphyrFakexaPriv *fakexa = scrpriv->fakexa;
-    void *offscreen_begin, *offscreen_end;
 
     pPix->devPrivate.ptr = fakexa->saved_ptrs[index];
     fakexa->saved_ptrs[index] = NULL;
@@ -330,7 +329,7 @@ ephyrDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst,
 }
 
 /**
- * Does fake acceleration of DownloadFromScren using memcpy.
+ * Does fake acceleration of UploadToScreen using memcpy.
  */
 static Bool
 ephyrUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src,
@@ -352,7 +351,7 @@ ephyrUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src,
     dst_pitch = exaGetPixmapPitch(pDst);
     dst = fakexa->exa->memoryBase + exaGetPixmapOffset(pDst);
     dst += y * dst_pitch + x * cpp;
-    ErrorF("uts %d,%d, %dx%d, %dbpp %p/%x\n", x, y, w, h, pDst->drawable.bitsPerPixel, dst, dst_pitch);
+
     for (; h > 0; h--) {
 	memcpy(dst, src, w * cpp);
 	dst += dst_pitch;