diff --git a/cde/lib/DtHelp/GifUtils.c b/cde/lib/DtHelp/GifUtils.c
index f0a78c44b..d21f869e8 100644
--- a/cde/lib/DtHelp/GifUtils.c
+++ b/cde/lib/DtHelp/GifUtils.c
@@ -1090,7 +1090,7 @@ create_pixmap( GifObj *g, pixel **image, int width, int height, Pixel fg, Pixel
 
   if (!ximData) {
     fprintf(stderr, "Could not allocate ximage data\n");
-    return NULL;
+    return None;
   }
 
   /* Monochrome */
@@ -1107,7 +1107,7 @@ create_pixmap( GifObj *g, pixel **image, int width, int height, Pixel fg, Pixel
 
   if (!g->f_ximage) {
     fprintf(stderr, "XCreateImage failed\n");
-    return NULL;
+    return None;
   }
 
 
@@ -1212,7 +1212,7 @@ else
 
   if (!pm) {
     fprintf(stderr, "could not create pixmap\n");
-    return NULL;
+    return None;
   }
 
   _XmPutScaledImage (g->f_dpy,pm,g->f_gc,g->f_ximage,
@@ -1239,7 +1239,7 @@ gif_to_pixmap(GifObj *g, byte *inbuf, unsigned int buflen, Dimension *w, Dimensi
 
   /* Create raw image from compress GIF data */
   raw_image = create_raw_image (inbuf, buflen, &width, &height, 1);
-  if (!raw_image) return NULL;
+  if (!raw_image) return None;
 
   /* Create X pixmap from raw image data */
   pixmap = create_pixmap(g, raw_image, width, height, fg, bg, ratio);
diff --git a/cde/lib/DtHelp/decompress.c b/cde/lib/DtHelp/decompress.c
index b96be4f5a..c21d80877 100644
--- a/cde/lib/DtHelp/decompress.c
+++ b/cde/lib/DtHelp/decompress.c
@@ -56,7 +56,7 @@ typedef long int	  count_int;
  typedef	unsigned char	char_type;
 #endif /* UCHAR */
 
-static	char_type magic_header[] = { "\037\235" };	/* 1F 9D */
+static int magic_header[] = { 0x1F, 0x9D };
 
 /* Defines for third byte of header */
 #define BIT_MASK	0x1f
@@ -128,8 +128,8 @@ _DtHelpCeBufFilePushZ (BufFilePtr f)
     CompressedFile  *file;
     int		    extra;
 
-    if ((BufFileGet(f) != (magic_header[0] & 0xFF)) ||
-	(BufFileGet(f) != (magic_header[1] & 0xFF)))
+    if ((BufFileGet(f) != magic_header[0]) ||
+	(BufFileGet(f) != magic_header[1]))
     {
 	return 0;
     }