diff --git a/options-table.c b/options-table.c
index e67d23d7..9bb141b1 100644
--- a/options-table.c
+++ b/options-table.c
@@ -102,7 +102,11 @@ const struct options_table_entry options_table[] = {
 	  .scope = OPTIONS_TABLE_SERVER,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
+#ifdef TMATE
+	  .default_num = 500
+#else
 	  .default_num = 100
+#endif
 	},
 
 	{ .name = "quiet",
diff --git a/tmate-msg.c b/tmate-msg.c
index f2566895..53d24ee8 100644
--- a/tmate-msg.c
+++ b/tmate-msg.c
@@ -66,7 +66,7 @@ void __tmate_status_message(const char *fmt, va_list ap)
 	free(message);
 }
 
-void printflike(1, 2) tmate_status_message(const char *fmt, ...)
+void tmate_status_message(const char *fmt, ...)
 {
 	va_list ap;