diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MIInferior.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MIInferior.java
index 6df7e6c71ce..4b8825c5f48 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MIInferior.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MIInferior.java
@@ -178,7 +178,7 @@ public class MIInferior extends Process {
 			abort.getMIInfo();
 			setTerminated(abort.getToken(), true);
 		} else if (session.isCoreSession() && !isTerminated()){
-			setTerminated(0, true);
+			setTerminated();
 		}
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java
index 131c459c49a..66e1ae2f5f4 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java
@@ -464,7 +464,7 @@ public class MISession extends Observable {
 		} catch (InterruptedException e) {
 		}
 
-		// Allow (10 secs) for the EventThread  to finish processing the queue.
+		// Kill the event Thread ... if it is not us.
 		if (!eventThread.equals(Thread.currentThread())) {			
 			// Kill the event Thread.
 			try {
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java
index 24497b91598..47247057315 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java
@@ -249,8 +249,8 @@ public class GDBCDIDebugger implements ICDIDebugger {
 	protected String renderDebuggerProcessLabel() {
 		String format = "{0} ({1})"; //$NON-NLS-1$
 		String timestamp = DateFormat.getInstance().format(new Date(System.currentTimeMillis()));
-		return MessageFormat.format(format, new String[]{
-				"Debugger Process", timestamp}); //$NON-NLS-1$
+		String message = MIPlugin.getResourceString("src.GDBDebugger.Debugger_process");
+		return MessageFormat.format(format, new String[]{message, timestamp}); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPluginResources.properties b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPluginResources.properties
index 48c9965fed1..d00665b0bbc 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPluginResources.properties
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPluginResources.properties
@@ -18,6 +18,7 @@ src.GDBDebugger.Error_initializing_shared_lib_options=Error initializing shared
 src.GDBDebugger.Error_creating_session=Error creating session: 
 src.GDBDebugger.Error_launch_timeout=Launch timeout
 src.GDBDebugger.Error_launch_cancel=Launch cancel
+src.GDBDebugger.Debugger_process=Debugger Process
 src.MISession.Process_Terminated=Process Terminated
 src.MISession.Thread_Terminated={R,T}xThread terminated
 src.MISession.Target_not_suspended=Target is not suspended