diff --git a/arch/arm/src/armv7-m/up_exception.S b/arch/arm/src/armv7-m/up_exception.S
index 31d8dbb0cc..c9f2160274 100644
--- a/arch/arm/src/armv7-m/up_exception.S
+++ b/arch/arm/src/armv7-m/up_exception.S
@@ -134,9 +134,9 @@ exception_common:
 
 #if CONFIG_ARCH_INTERRUPTSTACK > 3
 	ldr		sp, =g_intstackbase
-	push	r1						/* Save the MSP on the interrupt stack */
+	push	{r1}					/* Save the MSP on the interrupt stack */
 	bl		up_doirq				/* R0=IRQ, R1=register save area on stack */
-	pop		r1						/* Recover R1=main stack pointer */
+	pop		{r1}					/* Recover R1=main stack pointer */
 #else
 	msr	 msp, r1					/* We are using the main stack pointer */
 	bl		up_doirq				/* R0=IRQ, R1=register save area on stack */
diff --git a/configs/z8encore000zco/scripts/setenv.bat b/configs/z8encore000zco/scripts/setenv.bat
index f208a6e8bb..407cca97fe 100644
--- a/configs/z8encore000zco/scripts/setenv.bat
+++ b/configs/z8encore000zco/scripts/setenv.bat
@@ -41,7 +41,7 @@ set PATH=C:\MinGW\bin;%PATH%
 
 rem This is the location where I installed the ZDS-II toolchain.
 
-set PATH=C:\Program Files (x86)\ZiLOG\ZZDSII_Z8Encore!_5.0.0\bin;%PATH%
+set PATH=C:\Program Files (x86)\ZiLOG\ZDSII_Z8Encore!_5.0.0\bin;%PATH%
 
 rem This is the location where I installed the GNUWin32 tools.  See
 rem http://gnuwin32.sourceforge.net/.
diff --git a/configs/z8f64200100kit/scripts/setenv.bat b/configs/z8f64200100kit/scripts/setenv.bat
index 4281d5b117..e0526d988a 100644
--- a/configs/z8f64200100kit/scripts/setenv.bat
+++ b/configs/z8f64200100kit/scripts/setenv.bat
@@ -41,7 +41,7 @@ set PATH=C:\MinGW\bin;%PATH%
 
 rem This is the location where I installed the ZDS-II toolchain.
 
-set PATH=C:\Program Files (x86)\ZiLOG\ZZDSII_Z8Encore!_5.0.0\bin;%PATH%
+set PATH=C:\Program Files (x86)\ZiLOG\ZDSII_Z8Encore!_5.0.0\bin;%PATH%
 
 rem This is the location where I installed the GNUWin32 tools.  See
 rem http://gnuwin32.sourceforge.net/.