diff --git a/src/mainboard/amd/parmer/acpi/AmdImc.asl b/src/mainboard/amd/parmer/acpi/AmdImc.asl
index 937c10acc2..f55a12ad18 100644
--- a/src/mainboard/amd/parmer/acpi/AmdImc.asl
+++ b/src/mainboard/amd/parmer/acpi/AmdImc.asl
@@ -18,9 +18,11 @@ IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
 Method(WACK, 0)
 {
 	Store(0, Local0)
-	While (LNotEqual(Local0, 0xFA)) {
+	Store(50, Local1)
+	While (LAnd (LNotEqual(Local0, 0xFA), LGreater(Local1,0))) {
 		Store(MRG0, Local0)
 		Sleep(10)
+		Decrement(Local1)
 	}
 }
 
diff --git a/src/mainboard/amd/thatcher/acpi/AmdImc.asl b/src/mainboard/amd/thatcher/acpi/AmdImc.asl
index 937c10acc2..f55a12ad18 100644
--- a/src/mainboard/amd/thatcher/acpi/AmdImc.asl
+++ b/src/mainboard/amd/thatcher/acpi/AmdImc.asl
@@ -18,9 +18,11 @@ IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
 Method(WACK, 0)
 {
 	Store(0, Local0)
-	While (LNotEqual(Local0, 0xFA)) {
+	Store(50, Local1)
+	While (LAnd (LNotEqual(Local0, 0xFA), LGreater(Local1,0))) {
 		Store(MRG0, Local0)
 		Sleep(10)
+		Decrement(Local1)
 	}
 }
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Imc/ImcLib.c b/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Imc/ImcLib.c
index 6f8903c487..d8df41a26d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Imc/ImcLib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Imc/ImcLib.c
@@ -126,7 +126,7 @@ WaitForEcLDN9MailboxCmdAck (
   )
 {
   UINT8    Msgdata;
-  UINT16   Delaytime;
+  UINT32   Delaytime;
 
   Msgdata = 0;