diff --git a/format.c b/format.c
index ab3bc458..ec88573c 100644
--- a/format.c
+++ b/format.c
@@ -954,7 +954,7 @@ format_cb_cursor_character(struct format_tree *ft, struct format_entry *fe)
 char *
 format_grid_word(struct grid *gd, u_int x, u_int y)
 {
-	struct grid_line	*gl;
+	const struct grid_line	*gl;
 	struct grid_cell	 gc;
 	const char		*ws;
 	struct utf8_data	*ud = NULL;
diff --git a/tmux.h b/tmux.h
index b2e7cb64..35ae6a2a 100644
--- a/tmux.h
+++ b/tmux.h
@@ -936,8 +936,8 @@ struct window_pane {
 	char		*searchstr;
 	int		 searchregex;
 
-	u_int		 written;
-	u_int		 skipped;
+	size_t		 written;
+	size_t		 skipped;
 
 	TAILQ_ENTRY(window_pane) entry;
 	RB_ENTRY(window_pane) tree_entry;