diff --git a/handy-win32src-0.95-patched/gui-windows/Codewin.cpp b/handy-win32src-0.95-patched/gui-windows/Codewin.cpp
index 8a7908a..b8cf655 100644
--- a/handy-win32src-0.95-patched/gui-windows/Codewin.cpp
+++ b/handy-win32src-0.95-patched/gui-windows/Codewin.cpp
@@ -483,16 +483,16 @@ void CCodeWin::OnLButtonDblClk(UINT nFlags, CPoint point)
 	C6502_REGS regs;
 	mSystem.GetRegs(regs);
 
-	for(int loop=0;loop<MAX_CPU_BREAKPOINTS;loop++)
+	int loop;
+	for(loop=0;loop<MAX_CPU_BREAKPOINTS;loop++)
 	{
 		// Unset if already set
 		if(address==regs.cpuBreakpoints[loop]) break;
 	}
-    int loop;
 	if(loop>=MAX_CPU_BREAKPOINTS)
 	{
 		// New breakpoint at next free
-		for(int loop=0;loop<MAX_CPU_BREAKPOINTS;loop++)
+		for(loop=0;loop<MAX_CPU_BREAKPOINTS;loop++)
 		{
 			// Unset if already set
 			if(regs.cpuBreakpoints[loop]>0xffff) break;
diff --git a/handy-win32src-0.95-patched/gui-windows/Debuggerwin.cpp b/handy-win32src-0.95-patched/gui-windows/Debuggerwin.cpp
index 54e51ca..b85a362 100644
--- a/handy-win32src-0.95-patched/gui-windows/Debuggerwin.cpp
+++ b/handy-win32src-0.95-patched/gui-windows/Debuggerwin.cpp
@@ -615,6 +615,7 @@ bool CDebuggerWin::CommandStep(int argc, char **argv)
 		else
 		{
 			LineOutput("Invalid PC, must be in range 0-ffff");
+			return false;
 		}
 	}
 	else
@@ -622,7 +623,7 @@ bool CDebuggerWin::CommandStep(int argc, char **argv)
 		gSystemHalt=FALSE;		// Make sure we run always
 		gSingleStepMode=TRUE;	// Go for it....
 	}
-	return false;
+	return true;
 }
 
 bool CDebuggerWin::CommandBpoint(int argc, char **argv)