--- pgp/src/system.c	2018/04/24 16:43:24	1.1.1.7
+++ pgp/src/system.c	2018/04/24 16:44:27	1.1.1.8
@@ -194,7 +194,7 @@ void ttynorm(void)
 #ifndef SVR2
 #ifdef ultrix
 	/* Ultrix is broken and flushes the output as well! */
-	tcsetattr (ttyfd, TCSANOW, &tio);
+	tcsetattr (ttyfd, TCSANOW, &itio);
 #else
 	tcsetattr (ttyfd, TCSAFLUSH, &itio);
 #endif
@@ -341,7 +341,7 @@ register int n;
 #endif /* _BSD */
 
 #if (defined(MACH) || defined(SVR2) || defined(_BSD)) && !defined(NEXT) \
-&& !defined(AUX) || (defined(sun) && defined(i386))
+&& !defined(AUX) && !defined(__MACHTEN__) || (defined(sun) && defined(i386))
 int remove(name)
 char *name;
 {