diff --git a/login.c b/login.c
index dbc4974..b4e7c7e 100644
--- a/login.c
+++ b/login.c
@@ -103,6 +103,7 @@ static int get_raw_str(uint8 *s, int maxlen, int doecho)
 static void getstr(char *what, char *str, int rsize, int doecho)
 {
   fprintf(stdout, "%s: ", what);
+  fflush(stdout);
   get_raw_str(str, rsize, doecho);
   fprintf(stdout, "\n");
 }
@@ -391,17 +392,9 @@ int func_exec(int argc, char *argv[], int mode)
     xfree(buff);
     if (nargv != NULL) {
       if (!mode)
-#ifdef __WATCOMC__
-        spawnvp(P_WAIT, buf, (const char * const *)nargv);
-#else
         spawnvp(P_WAIT, buf, nargv);
-#endif
       else
-#ifdef __WATCOMC__
-        execvp(buf, (const char * const *)nargv);
-#else
         execvp(buf, nargv);
-#endif
     }
     xfree(buf);
   }