diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx
index d79b39ea2..303ff728e 100644
--- a/fluid/Fl_Function_Type.cxx
+++ b/fluid/Fl_Function_Type.cxx
@@ -551,13 +551,13 @@ void Fl_Decl_Type::write_code1() {
   while (e>c && e[-1]==';') e--;
   if (class_name(1)) {
     write_public(public_);
-    write_h("  %.*s;\n", e-c, c);
+    write_h("  %.*s;\n", (int)(e-c), c);
   } else {
     if (public_) {
-      write_h("extern %.*s;\n", e-c, c);
-      write_c("%.*s;\n", e-c, c);
+      write_h("extern %.*s;\n", (int)(e-c), c);
+      write_c("%.*s;\n", (int)(e-c), c);
     } else {
-      write_c("static %.*s;\n", e-c, c);
+      write_c("static %.*s;\n", (int)(e-c), c);
     }
   }
 }
diff --git a/src/vsnprintf.c b/src/vsnprintf.c
index 6949455f3..e2f39888e 100644
--- a/src/vsnprintf.c
+++ b/src/vsnprintf.c
@@ -72,13 +72,13 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) {
       else sign = 0;
 
       width = 0;
-      while (isdigit(*format)) width = width * 10 + *format++ - '0';
+      while (isdigit(*format & 255)) width = width * 10 + *format++ - '0';
 
       if (*format == '.') {
         format ++;
 	prec = 0;
 
-	while (isdigit(*format)) prec = prec * 10 + *format++ - '0';
+	while (isdigit(*format & 255)) prec = prec * 10 + *format++ - '0';
       } else prec = -1;
 
       if (*format == 'l' && format[1] == 'l') {
diff --git a/test/Makefile b/test/Makefile
index ebc4e2f97..2886ed15e 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -175,7 +175,7 @@ clean:
 install:
 	echo "Installing example programs to $(DESTDIR)$(docdir)/examples..."
 	-$(MKDIR) $(DESTDIR)$(docdir)/examples
-	$(CP) *.h *.cxx *.fl $(DESTDIR)$(docdir)/examples
+	$(CP) *.h *.cxx *.fl demo.menu *.xbm *.xpm $(DESTDIR)$(docdir)/examples
 	$(CHMOD) 644 $(DESTDIR)$(docdir)/examples/*.*
 
 uninstall:
diff --git a/test/demo.cxx b/test/demo.cxx
index 263ab5451..9859d0295 100644
--- a/test/demo.cxx
+++ b/test/demo.cxx
@@ -315,7 +315,7 @@ int load_the_menu(const char* fname)
 }
 
 int main(int argc, char **argv) {
-  putenv("FLTK_DOCDIR=../documentation");
+  putenv((char *)"FLTK_DOCDIR=../documentation");
   create_the_forms();
   char buf[256];
   strcpy(buf, argv[0]);