diff --git a/src/mainboard/iwave/iWRainbowG6/mptable.c b/src/mainboard/iwave/iWRainbowG6/mptable.c
index 09d9d9a4fd..19bd835cc6 100644
--- a/src/mainboard/iwave/iWRainbowG6/mptable.c
+++ b/src/mainboard/iwave/iWRainbowG6/mptable.c
@@ -29,7 +29,7 @@ void *smp_write_config_table(void *v)
 	int isa_bus;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
-	mptable_init(mc, "IWRAINBOWG6", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 	mptable_write_buses(mc, NULL, &isa_bus);
diff --git a/src/northbridge/intel/sch/acpi/hostbridge.asl b/src/northbridge/intel/sch/acpi/hostbridge.asl
index a029ef524b..7e92a0e671 100644
--- a/src/northbridge/intel/sch/acpi/hostbridge.asl
+++ b/src/northbridge/intel/sch/acpi/hostbridge.asl
@@ -23,6 +23,9 @@
 Name(_HID,EISAID("PNP0A08"))	// PCIe
 Name(_CID,EISAID("PNP0A03"))	// PCI
 
+Name(_ADR, 0)
+Name(_BBN, 0)
+
 Device (MCHC)
 {
 	Name(_ADR, 0x00000000)	// 0:0.0
@@ -204,17 +207,17 @@ Method (_CRS, 0, Serialized)
 				0x00000000, 0x000f0000, 0x000fffff, 0x00000000,
 				0x00010000,,, FSEG)
 
-		 // PCI Memory Region (Top of memory-0xfebfffff)
-		 DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-				 Cacheable, ReadWrite,
-				 0x00000000, 0x00000000, 0xfebfffff, 0x00000000,
-				 0x00000000,,, PM01)
+		// PCI Memory Region (Top of memory-0xfebfffff)
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x00000000, 0xfebfffff, 0x00000000,
+				0xfec00000,,, PM01)
 
-		 // TPM Area (0xfed40000-0xfed44fff)
-		 DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-				 Cacheable, ReadWrite,
-				 0x00000000, 0xfed40000, 0xfed44fff, 0x00000000,
-				 0x00000000,,, TPMR)
+		// TPM Area (0xfed40000-0xfed44fff)
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0xfed40000, 0xfed44fff, 0x00000000,
+				0x00005000,,, TPMR)
 	})
 
 	// Find PCI resource area in MCRS
diff --git a/src/southbridge/intel/sch/Makefile.inc b/src/southbridge/intel/sch/Makefile.inc
index 2d4d80e234..57bcf939a5 100644
--- a/src/southbridge/intel/sch/Makefile.inc
+++ b/src/southbridge/intel/sch/Makefile.inc
@@ -35,7 +35,8 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
 
 romstage-$(CONFIG_USBDEBUG) += usb_debug.c
 
-cbfs-files-y += cmc.bin
-cmc.bin-name := cmc.bin
-cmc.bin-type := 0xaa
-cmc.bin-position := 0xfffd0000
+# We don't ship that, but booting without it is bound to fail
+#cbfs-files-y += cmc.bin
+#cmc.bin-name := cmc.bin
+#cmc.bin-type := 0xaa
+#cmc.bin-position := 0xfffd0000