diff --git a/docs/help/in/lusers.in b/docs/help/in/lusers.in
index f9edf535..99089fb7 100644
--- a/docs/help/in/lusers.in
+++ b/docs/help/in/lusers.in
@@ -5,7 +5,7 @@
 
 %9Parameters:%9
 
-    The server to search on and the remote sever to search on; if no arguments
+    The server to search on and the remote server to search on; if no arguments
     are given, the active server will be used.
 
 %9Description:%9
diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index b76d4ce7..990c4fe2 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -137,7 +137,7 @@ static void get_server_splits(void *key, NETSPLIT_REC *split,
 			g_string_append_printf(chanrec->nicks, "%s, ", split->nick);
 
 			if (chanrec->nick_count == netsplit_max_nicks)
-                                chanrec->maxnickpos = chanrec->nicks->len;
+				chanrec->maxnickpos = chanrec->nicks->len - 2;
 		}
 	}
 }
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 2091b5a3..7482d470 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -405,7 +405,7 @@ void gui_printtext_init(void)
 	indent_functions = g_hash_table_new((GHashFunc) g_str_hash,
 					    (GCompareFunc) g_str_equal);
 
-	settings_add_int("history", "scrollback_lines", 500);
+	settings_add_int("history", "scrollback_lines", 5000);
 	settings_add_time("history", "scrollback_time", "1day");
 	settings_add_time("history", "scrollback_max_age", "0");
 	settings_add_int("history", "scrollback_burst_remove", 10);