diff --git a/src/cpu_common/cpu.c b/src/cpu_common/cpu.c
index 2e4a49303..b8ed3918b 100644
--- a/src/cpu_common/cpu.c
+++ b/src/cpu_common/cpu.c
@@ -2970,10 +2970,10 @@ void cpu_WRMSR()
                         	cpu_log("MTRR physmask[%d] = %08llx\n", temp2, temp);
 
                         	if ((mtrr_physmask_msr[temp2] >> 11) & 0x1)
-                                	mem_del_mtrr(mtrr_physbase_msr[temp2] & ~(0xFFF), mtrr_physmask_msr[temp2] & ~(0xFFF));
+                                	mem_del_mtrr(mtrr_physbase_msr[temp2] & ~(0xfff), mtrr_physmask_msr[temp2] & ~(0xfff));
 
                                 if ((temp >> 11) & 0x1)
-                                	mem_add_mtrr(mtrr_physbase_msr[temp2] & ~(0xFFF), temp & ~(0xFFF), mtrr_physbase_msr[temp2] & 0xFF);
+                                	mem_add_mtrr(mtrr_physbase_msr[temp2] & ~(0xfff), temp & ~(0xfff), mtrr_physbase_msr[temp2] & 0xff);
 
                                 mtrr_physmask_msr[temp2] = temp;
                         } else {
diff --git a/src/nvr_at.c b/src/nvr_at.c
index 4da1dc34b..c07bf4372 100644
--- a/src/nvr_at.c
+++ b/src/nvr_at.c
@@ -810,7 +810,7 @@ nvr_start(nvr_t *nvr)
     	uint16_t checksum = 0;
     	for (i = 0x10; i <= 0x2d; i++)
     		checksum += nvr->regs[i];
-    	nvr->regs[0x2e] = checksum >> 8;
+    	nvr->regs[0x2e] = (checksum >> 8);
     	nvr->regs[0x2f] = checksum;
     }