diff --git a/src/mainboard/lex/cv860a/Config b/src/mainboard/lex/cv860a/Config
index feb7d323ca..4b63799b18 100644
--- a/src/mainboard/lex/cv860a/Config
+++ b/src/mainboard/lex/cv860a/Config
@@ -12,7 +12,7 @@ southbridge via/vt82c686
 superio via/vt82c686
 mainboardinit cpu/p6/earlymtrr.inc
 
-option ENABLE_FIXED_AND_VARIABLE_MTRRS
+option ENABLE_FIXED_AND_VARIABLE_MTRRS=1
 option SUPERIO_DEVFN=0x88
 object mainboard.o
 keyboard pc80
diff --git a/src/northsouthbridge/sis/730/Config b/src/northsouthbridge/sis/730/Config
index 2a912763a7..d391f67500 100644
--- a/src/northsouthbridge/sis/730/Config
+++ b/src/northsouthbridge/sis/730/Config
@@ -1,4 +1,4 @@
-option SIS730
+option SIS730=1
 option SMA_SIZE=0xA0
 raminit northsouthbridge/sis/730/raminit.inc
 
diff --git a/util/nrv2b/nrv2b.c b/util/nrv2b/nrv2b.c
index f12a4f5eb0..818fac131e 100644
--- a/util/nrv2b/nrv2b.c
+++ b/util/nrv2b/nrv2b.c
@@ -783,8 +783,8 @@ find_match ( struct ucl_compress *c, struct ucl_swd *s,
 				break;
 			if (in != m)
 				if (memcmp(in,ip,c->m_len+1) == 0)
-					printf("%p %p %p
-%5d\n",in,ip,m,c->m_len);
+					printf("%p %p %p%5d\n",
+					    in,ip,m,c->m_len);
 
 			in++;
 		}
@@ -1445,11 +1445,9 @@ int main(int argc, char *argv[])
 		rewind(infile = f);
 	}
 	else if (argc != 4) {
-		Fprintf((stderr, "'lzhuf e file1 file2' encodes file1 into
-file2.\n"
+		Fprintf((stderr, "'lzhuf e file1 file2' encodes file1 into file2.\n"
 
-			"'lzhuf d file2 file1' decodes file2 into
-file1.\n"));
+			"'lzhuf d file2 file1' decodes file2 into file1.\n"));
 
 		return EXIT_FAILURE;
 	}