diff --git a/src/mainboard/tyan/TigerMPX/Config b/src/mainboard/tyan/TigerMPX/Config
index b27b101d19..cd0c8340c7 100644
--- a/src/mainboard/tyan/TigerMPX/Config
+++ b/src/mainboard/tyan/TigerMPX/Config
@@ -58,8 +58,7 @@ mainboardinit northbridge/amd/amd76x/mpinit.inc USE_FALLBACK_IMAGE
 ## Failover if we need to 
 ##
 
-#comment out 4 debug SMJ
-#mainboardinit southbridge/amd/amd768/cmos_boot_failover.inc USE_FALLBACK_IMAGE
+mainboardinit southbridge/amd/amd768/cmos_boot_failover.inc USE_FALLBACK_IMAGE
 
 ###
 ### O.k. We aren't just an intermediary anymore!
@@ -218,6 +217,7 @@ option FINAL_MAINBOARD_FIXUP=1
 ## This is useful for optional includes
 ##
 option USE_FALLBACK_IMAGE=0
+
 expr BUILD_NORMAL_IMAGE=!USE_FALLBACK_IMAGE
 
 ###
diff --git a/src/mainboard/tyan/TigerMPX/cmos.layout b/src/mainboard/tyan/TigerMPX/cmos.layout
index 78c4f0bff3..5bd8869dd6 100644
--- a/src/mainboard/tyan/TigerMPX/cmos.layout
+++ b/src/mainboard/tyan/TigerMPX/cmos.layout
@@ -26,7 +26,7 @@ entries
 0          384       r       0        reserved_memory
 384          1       e       4        boot_option
 385          1       e       4        last_boot
-386          3       e       5        baud_rate
+392          3       e       5        baud_rate
 392          4       e       6        debug_level
 396          1       e       1        power_on_after_fail
 #401          1       e       1        ECC_memory
diff --git a/util/baremetal/bootselect/elfImage.lds b/util/baremetal/bootselect/elfImage.lds
index 23c112df3d..6a24d34b44 100644
--- a/util/baremetal/bootselect/elfImage.lds
+++ b/util/baremetal/bootselect/elfImage.lds
@@ -35,13 +35,12 @@ SECTIONS
   __bss_start = .;		/* BSS */
   .bss (.): {
 	*(.bss)
+    _ebss = .;
+
+  	_heap = .;
+  	. += HEAPSIZE;
+    _eheap = .;
 	}
-  _ebss = .;
-  _heap = .;
-  .heap (.): {
-	. = HEAPSIZE;
-  }
-  _eheap = .;
   _end = . ;
 
   _ram_seg = _text;