diff --git a/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj b/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj
index 3e7270dd0b..3c477d8ff8 100644
--- a/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj
+++ b/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj
@@ -135,6 +135,7 @@
     <ProjectReference Include="..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
       <Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
       <Name>ICSharpCode.SharpDevelop.Widgets</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/AddIns/Analysis/CodeQuality/Engine/AssemblyAnalyzer.cs b/src/AddIns/Analysis/CodeQuality/Engine/AssemblyAnalyzer.cs
index b2bd83ccf1..300440e53a 100644
--- a/src/AddIns/Analysis/CodeQuality/Engine/AssemblyAnalyzer.cs
+++ b/src/AddIns/Analysis/CodeQuality/Engine/AssemblyAnalyzer.cs
@@ -123,9 +123,15 @@ namespace ICSharpCode.CodeQuality.Engine
 			}
 			
 			ILAnalyzer analyzer = new ILAnalyzer(loadedAssemblies.Select(asm => loader.GetCecilObject(asm)).ToArray(), this);
-			int count = methodMappings.Count + fieldMappings.Count + propertyMappings.Count;
+			int count = typeMappings.Count + methodMappings.Count + fieldMappings.Count + propertyMappings.Count;
 			int i  = 0;
 			
+			foreach (var element in typeMappings) {
+				ReportProgress(++i / (double)count);
+				AddRelationshipsForTypes(element.Key.DirectBaseTypes, element.Value);
+				AddRelationshipsForAttributes(element.Key.Attributes, element.Value);
+			}
+			
 			foreach (var element in methodMappings) {
 				ReportProgress(++i / (double)count);
 				var cecilObj = loader.GetCecilObject((IUnresolvedMethod)element.Key.UnresolvedMember);
@@ -242,7 +248,7 @@ namespace ICSharpCode.CodeQuality.Engine
 			
 			public override IType VisitTypeDefinition(ITypeDefinition type)
 			{
-				TypeNode  typeNode;
+				TypeNode typeNode;
 				if (context.typeMappings.TryGetValue(type, out typeNode))
 					node.AddRelationship(typeNode);
 				return base.VisitTypeDefinition(type);
diff --git a/src/AddIns/Analysis/CodeQuality/Gui/Controls/MatrixControl.cs b/src/AddIns/Analysis/CodeQuality/Gui/Controls/MatrixControl.cs
index 07dff60539..2a2b693c98 100644
--- a/src/AddIns/Analysis/CodeQuality/Gui/Controls/MatrixControl.cs
+++ b/src/AddIns/Analysis/CodeQuality/Gui/Controls/MatrixControl.cs
@@ -284,7 +284,7 @@ namespace ICSharpCode.CodeQuality.Gui
 				                                  i * CellHeight - offsetDiffY));
 		}
 		
-		public ImageSource CreateText(string text)
+		ImageSource CreateText(string text)
 		{
 			if (imgs.ContainsKey(text))
 				return imgs[text];
diff --git a/src/AddIns/Analysis/CodeQuality/Gui/DependencyMatrixView.xaml.cs b/src/AddIns/Analysis/CodeQuality/Gui/DependencyMatrixView.xaml.cs
index c7d4dcc7e5..812ed83b64 100644
--- a/src/AddIns/Analysis/CodeQuality/Gui/DependencyMatrixView.xaml.cs
+++ b/src/AddIns/Analysis/CodeQuality/Gui/DependencyMatrixView.xaml.cs
@@ -159,7 +159,7 @@ namespace ICSharpCode.CodeQuality.Gui
 			}
 		}
 		
-		MatrixTreeNode ConvertNode(DependencyObject node)
+		static MatrixTreeNode ConvertNode(DependencyObject node)
 		{
 			var c = Extensions.GetParent<SharpTreeViewItem>(node);
 			if (c != null)
diff --git a/src/AddIns/Analysis/CodeQuality/Utils/DependencyColorizer.cs b/src/AddIns/Analysis/CodeQuality/Utils/DependencyColorizer.cs
index 2e762ab647..e1a1430f8f 100644
--- a/src/AddIns/Analysis/CodeQuality/Utils/DependencyColorizer.cs
+++ b/src/AddIns/Analysis/CodeQuality/Utils/DependencyColorizer.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Windows.Media;
-
 using ICSharpCode.CodeQuality.Engine.Dom;
 
 namespace ICSharpCode.CodeQuality
@@ -87,13 +87,13 @@ namespace ICSharpCode.CodeQuality
 				return "";
 			// both > 0 => UsesAndUsedBy
 			if (value.Item1 > 0 && value.Item2 > 0)
-				return value.Item1.ToString();
+				return value.Item1.ToString(CultureInfo.InvariantCulture);
 			// a > 0 => Uses
 			if (value.Item1 > 0)
-				return value.Item1.ToString();
+				return value.Item1.ToString(CultureInfo.InvariantCulture);
 			// b > 0 => UsedBy
 			if (value.Item2 > 0)
-				return value.Item2.ToString();
+				return value.Item2.ToString(CultureInfo.InvariantCulture);
 			
 			return "";
 		}
diff --git a/src/AddIns/Analysis/CodeQuality/Utils/Utils.cs b/src/AddIns/Analysis/CodeQuality/Utils/Utils.cs
index 0f6355414a..6b76f725a7 100644
--- a/src/AddIns/Analysis/CodeQuality/Utils/Utils.cs
+++ b/src/AddIns/Analysis/CodeQuality/Utils/Utils.cs
@@ -3,8 +3,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Runtime.InteropServices;
-
 using ICSharpCode.CodeQuality.Engine.Dom;
 using Mono.Cecil;
 
@@ -25,7 +25,7 @@ namespace ICSharpCode.CodeQuality
 			
 			string text = GetText(item1, item2);
 			
-			return string.Format("{0} {1} {2}", left.Name, text, top.Name);
+			return string.Format(CultureInfo.InvariantCulture, "{0} {1} {2}", left.Name, text, top.Name);
 		}
 		
 		static string GetText(int item1, int item2)