diff --git a/headers/private/graphics/vesa/vesa.h b/headers/private/graphics/vesa/vesa.h
index 11c3f5e203..9bf55b261e 100644
--- a/headers/private/graphics/vesa/vesa.h
+++ b/headers/private/graphics/vesa/vesa.h
@@ -44,7 +44,7 @@ struct vbe_mode_info {
 	uint16		attributes;
 	uint8		window_a_attributes;
 	uint8		window_b_attributes;
-	uint16		window_granulatiry;
+	uint16		window_granularity;
 	uint16		window_size;
 	uint16		window_a_segment;
 	uint16		window_b_segment;
diff --git a/src/system/boot/platform/bios_ia32/video.cpp b/src/system/boot/platform/bios_ia32/video.cpp
index 87d00e80e3..590c727a33 100644
--- a/src/system/boot/platform/bios_ia32/video.cpp
+++ b/src/system/boot/platform/bios_ia32/video.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de.
  * Copyright 2008, Stephan Aßmus <superstippi@gmx.de>
  * Copyright 2008, Philippe Saint-Pierre <stpere@gmail.com>
  * Distributed under the terms of the MIT License.
@@ -1007,7 +1007,7 @@ fallback:
 
 		gKernelArgs.frame_buffer.width = 640;
 		gKernelArgs.frame_buffer.height = 480;
-		gKernelArgs.frame_buffer.bytes_per_row = 640 / 2;
+		gKernelArgs.frame_buffer.bytes_per_row = 80;
 		gKernelArgs.frame_buffer.depth = 4;
 		gKernelArgs.frame_buffer.physical_buffer.size
 			= gKernelArgs.frame_buffer.width
diff --git a/src/system/kernel/debug/frame_buffer_console.cpp b/src/system/kernel/debug/frame_buffer_console.cpp
index 5dfec30e59..3aedd7a505 100644
--- a/src/system/kernel/debug/frame_buffer_console.cpp
+++ b/src/system/kernel/debug/frame_buffer_console.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2005-2009, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -142,8 +142,8 @@ render_glyph(int32 x, int32 y, uint8 glyph, uint8 attr)
 	} else {
 		// monochrome mode
 
-		uint8 *base = (uint8 *)(sConsole.frame_buffer + sConsole.bytes_per_row * y * CHAR_HEIGHT
-			+ x * CHAR_WIDTH / 8);
+		uint8 *base = (uint8 *)(sConsole.frame_buffer
+			+ sConsole.bytes_per_row * y * CHAR_HEIGHT + x * CHAR_WIDTH / 8);
 		uint8 baseOffset =  (x * CHAR_WIDTH) & 0x7;
 
 		for (y = 0; y < CHAR_HEIGHT; y++) {
@@ -415,7 +415,8 @@ frame_buffer_console_init(kernel_args *args)
 
 	if (args->frame_buffer.depth == 4) {
 		// VGA mode will be treated as monochrome
-		args->frame_buffer.bytes_per_row /= 8;
+		// (ie. only the first plane will be used)
+		args->frame_buffer.depth = 1;
 	}
 
 	frame_buffer_update((addr_t)frameBuffer, args->frame_buffer.width,