Index: branches/meklort/i386/boot2/graphics.c
===================================================================
--- branches/meklort/i386/boot2/graphics.c	(revision 544)
+++ branches/meklort/i386/boot2/graphics.c	(revision 545)
@@ -55,7 +55,7 @@
 // Return the VESA mode that matches the properties specified.
 // If a mode is not found, then return the "best" available mode.
 
-static unsigned short
+unsigned short
 getVESAModeWithProperties( unsigned short     width,
 						  unsigned short     height,
 						  unsigned char      bitsPerPixel,
Index: branches/meklort/i386/boot2/graphics.h
===================================================================
--- branches/meklort/i386/boot2/graphics.h	(revision 544)
+++ branches/meklort/i386/boot2/graphics.h	(revision 545)
@@ -9,8 +9,8 @@
 
 #include "boot.h"
 #include "bootstruct.h"
+#include "vbe.h"
 
-
 #ifndef __BOOT_GRAPHICS_H
 #define __BOOT_GRAPHICS_H
 
@@ -45,5 +45,15 @@
 						   unsigned long maxArrayCount );
 
 
+unsigned short
+getVESAModeWithProperties( unsigned short     width,
+						  unsigned short     height,
+						  unsigned char      bitsPerPixel,
+						  unsigned short     attributesSet,
+						  unsigned short     attributesClear,
+						  VBEModeInfoBlock * outModeInfo,
+						  unsigned short *   vesaVersion );
 
+
+
 #endif /* !__BOOT_GRAPHICS_H */
Index: branches/meklort/i386/modules/GUI/GUI_module.c
===================================================================
--- branches/meklort/i386/modules/GUI/GUI_module.c	(revision 544)
+++ branches/meklort/i386/modules/GUI/GUI_module.c	(revision 545)
@@ -48,6 +48,18 @@
 extern char *msgbuf;
 extern char *cursor;
 
+
+
+
+char GUI_bootRescanPrompt[] =
+"Press Enter to start up Darwin/x86 with no options, or you can:\n"
+"  Press F5 after you swapped the media. The drive will be rescanned.\n"
+"  Type -v and press Enter to start up with diagnostic messages\n"
+"  Type ? and press Enter to learn about advanced startup options\n\n"
+"boot: ";
+
+
+
 /**
  ** The kernel is about to start, draw the boot graphics if we are not in
  ** verbose mode.
@@ -438,7 +450,6 @@
 static void GUI_showBootPrompt(int row, bool visible)
 {
 	extern char bootPrompt[];
-	extern char bootRescanPrompt[];
 	
 	if( bootArgs->Video.v_display == VGA_TEXT_MODE )
 	{
@@ -454,7 +465,7 @@
 		{
 			if (gEnableCDROMRescan)
 			{
-				printf( bootRescanPrompt );
+				printf( GUI_bootRescanPrompt );
 			} 
 			else
 			{
Index: branches/meklort/i386/modules/KernelPatcher/kernel_patcher.c
===================================================================
--- branches/meklort/i386/modules/KernelPatcher/kernel_patcher.c	(revision 544)
+++ branches/meklort/i386/modules/KernelPatcher/kernel_patcher.c	(revision 545)
@@ -279,7 +279,7 @@
 	
 	
 	
-	UInt32 jumpLocation = 0;
+	//UInt32 jumpLocation = 0;
 	
 	
 	if(symbol == 0 || symbol->addr == 0)
Index: branches/meklort/i386/modules/Memory/spd.c
===================================================================
--- branches/meklort/i386/modules/Memory/spd.c	(revision 544)
+++ branches/meklort/i386/modules/Memory/spd.c	(revision 545)
@@ -71,7 +71,10 @@
 /** Read one byte from the intel i2c, used for reading SPD on intel chipsets only. */
 unsigned char smb_read_byte_intel(uint32_t base, uint8_t adr, uint8_t cmd)
 {
-    int l1, h1, l2, h2;
+    int l1 = 0;
+	int l2 = 0;
+	int h1 = 0;
+	int h2 = 0;
     unsigned long long t;
 	
     outb(base + SMBHSTSTS, 0x1f);					// reset SMBus Controller
Index: branches/meklort/i386/modules/Memory/Memory.c
===================================================================
--- branches/meklort/i386/modules/Memory/Memory.c	(revision 544)
+++ branches/meklort/i386/modules/Memory/Memory.c	(revision 545)
@@ -41,7 +41,7 @@
 	if (dram_controller_dev!=NULL) {
 		scan_dram_controller(dram_controller_dev); // Rek: pci dev ram controller direct and fully informative scan ...
 	}
-	scan_memory(&Platform); // unfortunately still necesary for some comp where spd cant read correct speed
-	scan_spd(&Platform);
+	scan_memory(Platform); // unfortunately still necesary for some comp where spd cant read correct speed
+	scan_spd(Platform);
 
 }
\ No newline at end of file