diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs
index 1c4085d72d..4dd4b13e00 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs
@@ -114,6 +114,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		void AddVariables (TreeListViewItemCollection items, VariableCollection vars)
 		{
  			foreach (Variable var in vars) {
+				if (var.Name.StartsWith("CS$")) continue;
 				TreeListViewItem newItem = new TreeListViewItem();
 				newItem.Tag = var;
  				newItem.Text = var.Name;
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
index dd99833a71..61379a4851 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
@@ -110,7 +110,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 					try {
 						item.SubItems.Add(e.Thread.CurrentFunction.Name);
 					} catch (CurrentFunctionNotAviableException) {
-						item.SubItems.Add("<unaviable>");
+						item.SubItems.Add("N/A");
 					}
 					item.SubItems.Add(e.Thread.Priority.ToString());
 					item.SubItems.Add(e.Thread.Suspended.ToString());
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
index 8ec6a7108d..900372a65e 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
@@ -355,6 +355,7 @@ namespace ICSharpCode.SharpDevelop.Services
 		/// </summary>
 		public string GetValueAsString(string variableName)
 		{
+			if (!NDebugger.IsDebugging || NDebugger.IsProcessRunning) return null;
 			VariableCollection collection = NDebugger.LocalVariables;
 			if (collection == null)
 				return null;