diff -uF^[a-zA-Z_][a-z 	A-Z0-9_]*([^;]*$ sys/dev/tc/sfb.c.orig sys/dev/tc/sfb.c
--- sys/dev/tc/sfb.c.orig	Thu Mar 16 17:14:34 2000
+++ sys/dev/tc/sfb.c	Mon May  1 00:45:32 2000
@@ -999,7 +999,7 @@ sfb_putchar(id, row, col, uc, attr)
 	int scanspan, height, width, align, x, y;
 	u_int32_t lmask, rmask, glyph;
 	u_int8_t *g;
-	int fg, bg;
+	int fg, bg, fs;
 
 	x = col * ri->ri_font->fontwidth;
 	y = row * ri->ri_font->fontheight;
@@ -1007,6 +1007,7 @@ sfb_putchar(id, row, col, uc, attr)
 	height = ri->ri_font->fontheight;
 	uc -= ri->ri_font->firstchar;
 	g = (u_char *)ri->ri_font->data + uc * ri->ri_fontscale;
+	fs = ri->ri_font->stride;
 
 	p = ri->ri_bits + y * scanspan + x;
 	align = (long)p & SFBALIGNMASK;
@@ -1033,7 +1034,7 @@ sfb_putchar(id, row, col, uc, attr)
 			SFBADDRESS(sfb, (long)p);
 			SFBSTART(sfb, glyph << align);
 			p += scanspan;
-			g += 2;					/* XXX */
+			g += fs;
 			height--;
 		}
 	}
@@ -1053,7 +1054,7 @@ sfb_putchar(id, row, col, uc, attr)
 WRITE_MB();
 
 			p = (q += scanspan);
-			g += 2;					/* XXX */
+			g += fs;
 			height--;
 		}
 	}
diff -uF^[a-zA-Z_][a-z 	A-Z0-9_]*([^;]*$ sys/dev/rasops/rasops.c.orig sys/dev/rasops/rasops.c
--- sys/dev/rasops/rasops.c.orig	Thu Apr 13 15:36:45 2000
+++ sys/dev/rasops/rasops.c	Sun Apr 30 16:48:39 2000
@@ -150,7 +150,7 @@ rasops_init(ri, wantrows, wantcols)
 
 	/* This should never happen in reality... */
 #ifdef DEBUG
-	if ((int)ri->ri_bits & 3) {
+	if ((register_t)ri->ri_bits & 3) {
 		printf("rasops_init: bits not aligned on 32-bit boundary\n");
 		return (-1);
 	}