diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index cf759ca266..0072d1e66d 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -2218,12 +2218,6 @@
 				<Condition name = "ProjectActive" activeproject="C#"/>
 				<Condition name = "ProjectActive" activeproject="VBNet"/>
 			</Or>
-			<Condition name = "CompareProjectProperty" property = "SharpDevelopTargetFrameworkVersion" equals = "v1.0">
-				<ProjectContentRegistry id="Net10" class="ICSharpCode.SharpDevelop.Net10ProjectContentRegistry"/>
-			</Condition>
-			<Condition name = "CompareProjectProperty" property = "SharpDevelopTargetFrameworkVersion" equals = "v1.1">
-				<ProjectContentRegistry id="Net11" class="ICSharpCode.SharpDevelop.Net11ProjectContentRegistry"/>
-			</Condition>
 			<Condition name = "CompareProjectProperty" property = "SharpDevelopTargetFrameworkVersion" equals = "CF 2.0">
 				<ProjectContentRegistry id="NetCF20" class="ICSharpCode.SharpDevelop.NetCF20ProjectContentRegistry"/>
 			</Condition>
diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs
index 92214ae6e5..57fa62526a 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs
@@ -50,8 +50,8 @@ namespace ICSharpCode.FormsDesigner.Gui
 		
 		void PrintGACCache()
 		{
-			foreach (GacInterop.AssemblyListEntry asm in GacInterop.GetAssemblyList()) {
-				ListViewItem item = new ListViewItem(new string[] {asm.Name, asm.Version});
+			foreach (DomAssemblyName asm in GacInterop.GetAssemblyList()) {
+				ListViewItem item = new ListViewItem(new string[] {asm.ShortName, asm.Version});
 				item.Tag = asm.FullName;
 				((ListView)ControlDictionary["gacListView"]).Items.Add(item);
 			}
diff --git a/src/AddIns/Misc/MonoAddIn/Project/Src/MonoGacReferencePanel.cs b/src/AddIns/Misc/MonoAddIn/Project/Src/MonoGacReferencePanel.cs
index 375f477c0e..7afd2e2716 100644
--- a/src/AddIns/Misc/MonoAddIn/Project/Src/MonoGacReferencePanel.cs
+++ b/src/AddIns/Misc/MonoAddIn/Project/Src/MonoGacReferencePanel.cs
@@ -26,7 +26,7 @@ namespace ICSharpCode.MonoAddIn
 			foreach (MonoAssemblyName assemblyName in MonoGlobalAssemblyCache.GetAssemblyNames()) {
 				list.Add(new DomAssemblyName(assemblyName.FullName));
 			}
-			return itemList;
+			return list;
 		}
 	}
 }