diff --git a/options-table.c b/options-table.c
index 08efa6b2..3c9d292d 100644
--- a/options-table.c
+++ b/options-table.c
@@ -369,7 +369,7 @@ const struct options_table_entry options_table[] = {
 	  .minimum = INPUT_BUF_DEFAULT_SIZE,
 	  .maximum = UINT_MAX,
 	  .default_num = INPUT_BUF_DEFAULT_SIZE,
-	  .text = "Number of byte accpted in a single input before dropping."
+	  .text = "Number of bytes accepted in a single input before dropping."
 	},
 
 	{ .name = "menu-style",
diff --git a/tmux.h b/tmux.h
index 159148ba..113eece2 100644
--- a/tmux.h
+++ b/tmux.h
@@ -671,7 +671,7 @@ typedef u_int utf8_char;
  * characters as well. It can't be more than 32 bytes without changes to how
  * characters are stored.
  */
-#define UTF8_SIZE 21
+#define UTF8_SIZE 32
 struct utf8_data {
 	u_char	data[UTF8_SIZE];