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 5515e66337..1c4085d72d 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
@@ -95,17 +95,17 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 			e.Item.Items.Clear();
 
 			ObjectVariable var = e.Item.Tag as ObjectVariable;
-			/*if (var != null && var.HasBaseClass && var.BaseClass.Type != "System.Object")
+			if (var != null && var.HasBaseClass && var.BaseClass.Type != "System.Object")
 			{
 				TreeListViewItem newItem = new TreeListViewItem();
-				newItem.Text = "Base class";
+				newItem.Text = "<Base class>";
 				newItem.SubItems.Add(var.BaseClass.Value.ToString());
 				newItem.SubItems.Add(var.BaseClass.Type);
 				newItem.Tag = var.BaseClass;
 				newItem.ImageIndex = 0; // Class
 				newItem.Items.Add(""); // Show plus icon
 				e.Item.Items.Add(newItem);
-			}*/
+			}
 			AddVariables(e.Item.Items, ((Variable)e.Item.Tag).SubVariables);
 
 			localVarList.EndUpdate();
@@ -155,7 +155,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 						item.ImageIndex = 0; // Class
 						item.Items.Add(""); // Show plus icon
 
-						object devNull = (var as ObjectVariable).SubVariables; // Cache variables TODO: LAME
+						//object devNull = (var as ObjectVariable).SubVariables; // Cache variables TODO: LAME
 
 					} else if (var is PropertyVariable){
 						// It is a property
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs
index b1cc75984f..cff3da796e 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs
@@ -282,7 +282,8 @@ namespace DebuggerLibrary
 				symRootScope = symMethod.RootScope;
 				AddScopeToVariableCollection(symRootScope, ref collection);
 				
-			// Properties		
+			// Properties
+				/*
 				IntPtr methodEnumPtr = IntPtr.Zero;
 				uint methodsFetched;
 				while(true) {
@@ -319,6 +320,7 @@ namespace DebuggerLibrary
 						collection.Add(new PropertyVariable(eval, name));
 					}
 				}
+				*/
 			} 
 			catch (FrameNotAviableException) {
 				System.Diagnostics.Debug.Fail("Unable to get local variables. Frame is not aviable");