--- src/src/metamail/codes.c
+++ src/src/metamail/codes.c
@@ -101,6 +101,7 @@ int PortableNewlines;
 
 void
 output64chunk(c1, c2, c3, pads, outfile)
+int c1, c2, c3, pads;
 FILE *outfile;
 {
     putc(basis_64[c1>>2], outfile);
--- src/src/metamail/mailto.c
+++ src/src/metamail/mailto.c
@@ -456,6 +456,7 @@ int definitelynew;
 
 int
 main(argc, argv)
+int argc;
 char **argv;
 {
     char *sdum, *LineBuf, CmdBuf[100];
@@ -2034,7 +2035,7 @@ int UseVisual;
     if (!editor) editor = DEFAULT_EDITOR;
     if (!FirstPart->next) {
         /* Only one part */
-        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", editor, FirstPart->filename);
+        snprintf(CmdBuf, CMDSIZE, "%s %s", editor, FirstPart->filename);
         printf("Executing: %s\n", CmdBuf);
         if (SYSTEM(CmdBuf) == -1) {
             fprintf(stderr, "mailto: warning: failed to execute: %s\n", CmdBuf);
@@ -2052,7 +2053,7 @@ int UseVisual;
     lastmp = mp = FirstPart;
     while (mp) {
         printf("Part #%d is of type '%s'.\n", partct, mp->content_type);
-        snprintf(CmdBuf, sizeof(CmdBuf), "%s %s", editor, mp->filename);
+        snprintf(CmdBuf, CMDSIZE, "%s %s", editor, mp->filename);
         if (mp->mc && mp->mc->editcommand) {
             BuildCommand(CmdBuf2, mp->mc->editcommand, mp->filename);
         } else {
--- src/src/metamail/metamail.c
+++ src/src/metamail/metamail.c
@@ -1908,7 +1908,7 @@ struct part **PartsWritten;
                         UsedLittleFiles=1;
                     }
                     if (*from == 'n') {
-                        char numbuf[10];
+                        char numbuf[12];
                         sprintf(numbuf, "%d", numparts);
                         strcpy(to, numbuf);
                         to += strlen(numbuf);
--- src/src/metamail/splitmail.c
+++ src/src/metamail/splitmail.c
@@ -69,6 +69,7 @@ char *s;
 
 int
 main(argc, argv)
+int argc;
 char **argv;
 {
     int i, DoDeliver=0, SplitSize=DEFAULT_SPLIT_SIZE, dum, InNewline=1, bytesread, whichpart=1, Verbose=0, numparts = -1, c;
--- src/src/metamail/uue.c
+++ src/src/metamail/uue.c
@@ -10,6 +10,7 @@ void
 uueget (ptr, outfp, n)
 char *ptr;
 FILE *outfp;
+int n;
 {
     unsigned char c1, c2, c3;
     unsigned char p0, p1, p2, p3;
--- src/src/richmail/richtext.c
+++ src/src/richmail/richtext.c
@@ -246,9 +246,13 @@ char **argv;
 	else
 	  KE[0] = '\0';
         if ((dum = (char*) tgetstr("so", &cp)))
-	  strcpy (highlightbuf, dum); highlightbuf[0] = '\0';
+	  strcpy (highlightbuf, dum);
+        else
+          highlightbuf[0] = '\0';
         if ((dum = (char*) tgetstr("se", &cp)))
-	  strcpy (highlightendbuf, dum); highlightendbuf[0] = '\0';
+	  strcpy (highlightendbuf, dum);
+        else
+          highlightendbuf[0] = '\0';
         if ((dum = (char*) tgetstr("md", &cp))) 
 	  strcpy (BoldOn, dum); 
 	else 
@@ -842,6 +846,7 @@ FILE *fp;
 static void ResetTerminalCodes(FakeTerminal, highlight, underline, bold, highlightbuf, highlightendbuf,
                     modifiedhighlight, StartUnderline, StopUnderline, modifiedunderline,
                     BoldOn, BoldOff, modifiedbold)
+int FakeTerminal, highlight, underline, bold, modifiedhighlight, modifiedunderline, modifiedbold;
 char *highlightbuf, *highlightendbuf, *StartUnderline, *StopUnderline,
     *BoldOn, *BoldOff;
 {