diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
index 7aaf4782cb..8a56bc6ce4 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
@@ -29,10 +29,10 @@ Method (_PTS, 1)
 	\_SB.PCI0.FPTS ()
 
 	/* Clear wake status structure. */
-	Store (0, PEWD)
-	Store (0, WKST[0])
-	Store (0, WKST[1])
-	Store (7, UPWS)
+	PEWD = 0
+	WKST[0] = 0
+	WKST[1] = 0
+	UPWS = 7
 }
 
 /*
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
index a30a2cc342..6a9afa8130 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
@@ -52,10 +52,10 @@ Scope (\_TZ)
 		Method (_TMP, 0, Serialized)
 		{
 			/* Get temperature from EC in deci-kelvin */
-			Store (\_SB.PCI0.LPCB.EC0.TSRD (TMPS), Local0)
+			Local0 = \_SB.PCI0.LPCB.EC0.TSRD (TMPS)
 
 			/* Critical temperature in deci-kelvin */
-			Store (CTOK (\TCRT), Local1)
+			Local1 = CTOK (\TCRT)
 
 			If (Local0 >= Local1) {
 				Printf ("CRITICAL TEMPERATURE: %o", Local0)
@@ -64,7 +64,7 @@ Scope (\_TZ)
 				Sleep (1000)
 
 				/* Re-read temperature from EC */
-				Store (\_SB.PCI0.LPCB.EC0.TSRD (TMPS), Local0)
+				Local0 = \_SB.PCI0.LPCB.EC0.TSRD (TMPS)
 
 				Printf ("RE-READ TEMPERATURE: %o", Local0)
 			}