diff --git a/lib/arch/CArchAppUtilUnix.cpp b/lib/arch/CArchAppUtilUnix.cpp
index bedc4afa..8590c013 100644
--- a/lib/arch/CArchAppUtilUnix.cpp
+++ b/lib/arch/CArchAppUtilUnix.cpp
@@ -34,7 +34,7 @@ CArchAppUtilUnix::parseArg(const int& argc, const char* const* argv, int& i)
 		app().argsBase().m_display = argv[++i];
 	}
 
-	else if (app().isArg(i, argc, argv, NULL, "--disable-xinitthreads")) {
+	else if (app().isArg(i, argc, argv, NULL, "--no-xinitthreads")) {
 		app().argsBase().m_disableXInitThreads = true;
 	}
 
diff --git a/lib/platform/CXWindowsScreen.cpp b/lib/platform/CXWindowsScreen.cpp
index 9dcb11ba..3b95ffef 100644
--- a/lib/platform/CXWindowsScreen.cpp
+++ b/lib/platform/CXWindowsScreen.cpp
@@ -113,6 +113,8 @@ CXWindowsScreen::CXWindowsScreen(const char* displayName, bool isPrimary, bool d
 	  // initializes Xlib support for concurrent threads.
 	  if (XInitThreads() == 0)
 	    throw XArch("XInitThreads() returned zero");
+	} else {
+		LOG((CLOG_DEBUG "skipping XInitThreads()"));
 	}
 
 	// set the X I/O error handler so we catch the display disconnecting
diff --git a/lib/synergy/CApp.h b/lib/synergy/CApp.h
index 5375f612..55179bdc 100644
--- a/lib/synergy/CApp.h
+++ b/lib/synergy/CApp.h
@@ -163,8 +163,8 @@ private:
 #  define HELP_SYS_ARGS \
 	" [--daemon|--no-daemon]"
 #  define HELP_SYS_INFO \
-    "  -f, --no-daemon          run in the foreground.\n" \
-    "*     --daemon             run as a daemon.\n"
+	"  -f, --no-daemon          run in the foreground.\n"	\
+	"*     --daemon             run as a daemon.\n"
 
 #elif SYSAPI_WIN32
 
diff --git a/lib/synergy/CClientApp.cpp b/lib/synergy/CClientApp.cpp
index e3c9f511..b6182e61 100644
--- a/lib/synergy/CClientApp.cpp
+++ b/lib/synergy/CClientApp.cpp
@@ -157,9 +157,10 @@ CClientApp::help()
 {
 #if WINAPI_XWINDOWS
 #  define WINAPI_ARG \
-	" [--display <display>]"
+	" [--display <display>] [--no-xinitthreads]"
 #  define WINAPI_INFO \
-	"      --display <display>  connect to the X server at <display>\n"
+	"      --display <display>  connect to the X server at <display>\n" \
+	"      --no-xinitthreads    do not call XInitThreads()\n"
 #else
 #  define WINAPI_ARG
 #  define WINAPI_INFO
@@ -181,6 +182,7 @@ CClientApp::help()
 		WINAPI_INFO
 		HELP_SYS_INFO
 		"      --yscroll <delta>    defines the vertical scrolling delta, which is\n"
+		"                           120 by default.\n"
 		HELP_COMMON_INFO_2
 		"\n"
 		"* marks defaults.\n"
diff --git a/lib/synergy/CServerApp.cpp b/lib/synergy/CServerApp.cpp
index 290afc33..10784be0 100644
--- a/lib/synergy/CServerApp.cpp
+++ b/lib/synergy/CServerApp.cpp
@@ -150,9 +150,10 @@ CServerApp::help()
 	// window api args (windows/x-windows/carbon)
 #if WINAPI_XWINDOWS
 #  define WINAPI_ARGS \
-	" [--display <display>]"
+	" [--display <display>] [--no-xinitthreads]"
 #  define WINAPI_INFO \
-	"      --display <display>  connect to the X server at <display>\n"
+	"      --display <display>  connect to the X server at <display>\n" \
+	"      --no-xinitthreads    do not call XInitThreads()\n"
 #else
 #  define WINAPI_ARGS
 #  define WINAPI_INFO