diff --git a/Makefile b/Makefile
index 76a8122..ed9d81c 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ HDR=ebind.h edef.h efunc.h epath.h estruct.h evar.h util.h version.h
 
 CC=gcc
 WARNINGS=-Wall -Wstrict-prototypes
-CFLAGS=-O2 $(WARNINGS)
+CFLAGS=-O2 $(WARNINGS) -g
 #CC=c89 +O3			# HP
 #CFLAGS= -D_HPUX_SOURCE -DSYSV
 #CFLAGS=-O4 -DSVR4		# Sun
diff --git a/estruct.h b/estruct.h
index 3c382ce..8240f78 100644
--- a/estruct.h
+++ b/estruct.h
@@ -415,8 +415,8 @@ struct window {
 	struct line *w_markp;	/* Line containing "mark"       */
 	int w_doto;		/* Byte offset for "."          */
 	int w_marko;		/* Byte offset for "mark"       */
-	char w_toprow;		/* Origin 0 top row of window   */
-	char w_ntrows;		/* # of rows of text in window  */
+	int w_toprow;		/* Origin 0 top row of window   */
+	int w_ntrows;		/* # of rows of text in window  */
 	char w_force;		/* If NZ, forcing row.          */
 	char w_flag;		/* Flags.                       */
 #if	COLOR