Index: trunk/i386/libsaio/fake_efi.c
===================================================================
--- trunk/i386/libsaio/fake_efi.c	(revision 2174)
+++ trunk/i386/libsaio/fake_efi.c	(revision 2175)
@@ -18,6 +18,8 @@
 #include "pci.h"
 #include "sl.h"
 
+
+
 extern void setup_pci_devs(pci_dt_t *pci_dt);
 
 /*
@@ -83,7 +85,7 @@
 static uint8_t const VOIDRET_INSTRUCTIONS[] = {0xc3};
 
 /* movl $0x80000003,%eax; ret */
-static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS[] = {0xb8, 0x03, 0x00, 0x00, 0x80, 0xc3};
+static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS[] = {0x48, 0xb8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc3};
 
 EFI_SYSTEM_TABLE_32 *gST32 = NULL;
 EFI_SYSTEM_TABLE_64 *gST64 = NULL;
@@ -388,9 +390,9 @@
  */
 
 /* These should be const but DT__AddProperty takes char* */
-static const char const TSC_Frequency_prop[] = "TSCFrequency";
-static const char const FSB_Frequency_prop[] = "FSBFrequency";
-static const char const CPU_Frequency_prop[] = "CPUFrequency";
+static const char TSC_Frequency_prop[] = "TSCFrequency";
+static const char FSB_Frequency_prop[] = "FSBFrequency";
+static const char CPU_Frequency_prop[] = "CPUFrequency";
 
 /*==========================================================================
  * SMBIOS
@@ -424,16 +426,16 @@
  */
 
 /* These should be const but DT__AddProperty takes char* */
-static const char const FIRMWARE_REVISION_PROP[] = "firmware-revision";
-static const char const FIRMWARE_ABI_PROP[] = "firmware-abi";
-static const char const FIRMWARE_VENDOR_PROP[] = "firmware-vendor";
-static const char const FIRMWARE_ABI_32_PROP_VALUE[] = "EFI32";
-static const char const FIRMWARE_ABI_64_PROP_VALUE[] = "EFI64";
-static const char const SYSTEM_ID_PROP[] = "system-id";
-static const char const SYSTEM_SERIAL_PROP[] = "SystemSerialNumber";
-static const char const SYSTEM_TYPE_PROP[] = "system-type";
-static const char const MODEL_PROP[] = "Model";
-static const char const BOARDID_PROP[] = "board-id";
+static const char FIRMWARE_REVISION_PROP[] = "firmware-revision";
+static const char FIRMWARE_ABI_PROP[] = "firmware-abi";
+static const char FIRMWARE_VENDOR_PROP[] = "firmware-vendor";
+static const char FIRMWARE_ABI_32_PROP_VALUE[] = "EFI32";
+static const char FIRMWARE_ABI_64_PROP_VALUE[] = "EFI64";
+static const char SYSTEM_ID_PROP[] = "system-id";
+static const char SYSTEM_SERIAL_PROP[] = "SystemSerialNumber";
+static const char SYSTEM_TYPE_PROP[] = "system-type";
+static const char MODEL_PROP[] = "Model";
+static const char BOARDID_PROP[] = "board-id";
 
 /*
  * Get an smbios option string option to convert to EFI_CHAR16 string
Index: trunk/i386/modules/Keylayout/Keylayout.c
===================================================================
--- trunk/i386/modules/Keylayout/Keylayout.c	(revision 2174)
+++ trunk/i386/modules/Keylayout/Keylayout.c	(revision 2175)
@@ -117,7 +117,7 @@
 		sprintf(layoutPath, "/Extra/Keymaps/%s", val);
 		// Add the extension if needed
 		if (len <= 4 || strcmp(val+len-4,".lyt") != 0)
-			strncat(layoutPath, ".lyt", sizeof(layoutPath));
+			strncat(layoutPath, ".lyt", sizeof(layoutPath) - strlen(layoutPath) - 1);
 
 		if (!load_keyboard_layout_file(layoutPath)) {
 			printf("Can't load %s keyboard layout file. Keylayout will not be used !\n",
Index: trunk/i386/modules/AcpiCodec/acpi_codec.c
===================================================================
--- trunk/i386/modules/AcpiCodec/acpi_codec.c	(revision 2174)
+++ trunk/i386/modules/AcpiCodec/acpi_codec.c	(revision 2175)
@@ -1769,7 +1769,7 @@
 {
 	{ 
         
-		TagPtr CstateTag;		
+		TagPtr CstateTag = NULL;
         U32 entry_count = 0;
         
         if (bootInfo->chameleonConfig.dictionary)