diff --git a/mosh-server.cpp b/mosh-server.cpp
index 2da68de..c0146a7 100644
--- a/mosh-server.cpp
+++ b/mosh-server.cpp
@@ -58,7 +58,8 @@ int main( int argc, char *argv[] )
   }
 
   if ( !(child_termios.c_iflag & IUTF8) ) {
-    fprintf( stderr, "Warning: Locale is UTF-8 but termios IUTF8 flag not set. Setting IUTF8 flag.\n" );
+    /* SSH should also convey IUTF8 across connection. */
+    //    fprintf( stderr, "Warning: Locale is UTF-8 but termios IUTF8 flag not set. Setting IUTF8 flag.\n" );
     child_termios.c_iflag |= IUTF8;
   }
 
@@ -115,7 +116,7 @@ int main( int argc, char *argv[] )
     }
   }
 
-  printf( "[mosh-server is exiting.]\n" );
+  printf( "\n[mosh-server is exiting.]\n" );
 
   return 0;
 }
diff --git a/stmclient.cpp b/stmclient.cpp
index 4e2a7ef..53e7cdb 100644
--- a/stmclient.cpp
+++ b/stmclient.cpp
@@ -37,7 +37,8 @@ void STMClient::init( void )
   /* Put terminal driver in raw mode */
   raw_termios = saved_termios;
   if ( !(raw_termios.c_iflag & IUTF8) ) {
-    fprintf( stderr, "Warning: Locale is UTF-8 but termios IUTF8 flag not set. Setting IUTF8 flag.\n" );
+    /* SSH should also convey IUTF8 across connection. */
+    //    fprintf( stderr, "Warning: Locale is UTF-8 but termios IUTF8 flag not set. Setting IUTF8 flag.\n" );
     raw_termios.c_iflag |= IUTF8;
   }