diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index c68c000fa..e61ed721e 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -165,6 +165,9 @@ namespace {
 				}
 			}
 			fprintf(stderr, "%s\n", message.c_str());
+#if LL_WINDOWS
+			fflush(stderr); //Now using a buffer. flush is required.
+#endif
 			if (ANSI_YES == mUseANSI) colorANSI("0"); // reset
 		}
 	
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp
index 25cc25688..8461d5d86 100644
--- a/indra/llimage/llimagej2c.cpp
+++ b/indra/llimage/llimagej2c.cpp
@@ -142,6 +142,7 @@ void LLImageJ2C::openDSO()
 		fprintf(stderr, "error: %d, %s\n", rv, errbuf);
 		apr_dso_error(j2cimpl_dso_handle, errbuf, sizeof(errbuf));
 		fprintf(stderr, "dso-error: %d, %s\n", rv, errbuf);
+		fflush(stderr);
 #endif
 
 		if ( j2cimpl_dso_handle )
diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp
index 9d4c5ecc8..e5d6747d9 100644
--- a/indra/llvfs/lldir_win32.cpp
+++ b/indra/llvfs/lldir_win32.cpp
@@ -112,7 +112,7 @@ LLDir_Win32::LLDir_Win32()
 	}
 	else
 	{
-		fprintf(stderr, "Couldn't get APP path, assuming current directory!");
+		LL_WARNS("AppInit") << "Couldn't get APP path, assuming current directory!\n" << LL_ENDL;
 		GetCurrentDirectory(MAX_PATH, w_str);
 		mExecutableDir = utf16str_to_utf8str(llutf16string(w_str));
 		// Assume it's the current directory
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 7a8d486b7..051a5cdaa 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -365,7 +365,8 @@ void create_console()
 	h_con_handle = _open_osfhandle(l_std_handle, _O_TEXT);
 	fp = _fdopen( h_con_handle, "w" );
 	*stderr = *fp;
-	setvbuf( stderr, NULL, _IONBF, 0 );
+	setvbuf( stderr, NULL, _IOFBF, 1024 );  //Assigning a buffer improves speed a LOT, esp on vista/win7
+											//_IOLBF is borked.
 }
 
 LLAppViewerWin32::LLAppViewerWin32(const char* cmd_line) :