diff --git a/tftp/main.c b/tftp/main.c
index ecdc0e0..ac06330 100644
--- a/tftp/main.c
+++ b/tftp/main.c
@@ -806,7 +806,6 @@ static void command(void)
             exit(0);            /* EOF */
 #else
         fputs(prompt, stdout);
-        fflush(stdout);
         if (fgets(line, LBUFLEN, stdin) == 0) {
             if (feof(stdin)) {
                 exit(0);
diff --git a/tftp/tftp.c b/tftp/tftp.c
index 9c9c5af..33a4175 100644
--- a/tftp/tftp.c
+++ b/tftp/tftp.c
@@ -278,16 +278,15 @@ makerequest(int request, const char *name,
             struct tftphdr *tp, const char *mode)
 {
     char *cp;
-    size_t len;
 
     tp->th_opcode = htons((u_short) request);
     cp = (char *)&(tp->th_stuff);
-    len = strlen(name) + 1;
-    memcpy(cp, name, len);
-    cp += len;
-    len = strlen(mode) + 1;
-    memcpy(cp, mode, len);
-    cp += len;
+    strcpy(cp, name);
+    cp += strlen(name);
+    *cp++ = '\0';
+    strcpy(cp, mode);
+    cp += strlen(mode);
+    *cp++ = '\0';
     return (cp - (char *)tp);
 }