diff --git a/.gitignore b/.gitignore
index defcc3fe2f..bd3b475b46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,5 @@ bin/
 /src/Main/GlobalAssemblyInfo.vb
 /src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.AppProperties.cs
 
-/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib
\ No newline at end of file
+/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib
+/packages/
diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/DomMenuCommand.cs b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/DomMenuCommand.cs
index c58b7ea78a..3a065bb70c 100644
--- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/DomMenuCommand.cs
+++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/DomMenuCommand.cs
@@ -41,16 +41,13 @@ namespace ICSharpCode.Profiler.AddIn.Commands
 			if (name == null || c == null)
 				return null;
 			
-			if (name == ".ctor" || name == ".cctor") // Constructor
-				name = name.Replace('.', '#');
-			
-			if (name.StartsWith("get_") || name.StartsWith("set_")) {
+			if (name.StartsWith("get_", StringComparison.Ordinal) || name.StartsWith("set_", StringComparison.Ordinal)) {
 				// Property Getter or Setter
 				name = name.Substring(4);
 				IProperty prop = c.Properties.FirstOrDefault(p => p.Name == name);
 				if (prop != null)
 					return prop;
-			} else if (name.StartsWith("add_") || name.StartsWith("remove_")) {
+			} else if (name.StartsWith("add_", StringComparison.Ordinal) || name.StartsWith("remove_", StringComparison.Ordinal)) {
 				name = name.Substring(4);
 				IEvent ev = c.Events.FirstOrDefault(e => e.Name == name);
 				if (ev != null)
diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/GoToDefinition.cs b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/GoToDefinition.cs
index a51ce45018..c23405d090 100644
--- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/GoToDefinition.cs
+++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/GoToDefinition.cs
@@ -39,7 +39,7 @@ namespace ICSharpCode.Profiler.AddIn.Commands
 				ITypeDefinition c = GetClassFromName(selectedItem.FullyQualifiedClassName);
 				if (c != null) {
 					IMember member = GetMemberFromName(c, selectedItem.MethodName, selectedItem.Parameters);
-					if (!member.Region.IsEmpty && !string.IsNullOrEmpty(member.Region.FileName)) {
+					if (member != null && !member.Region.IsEmpty && !string.IsNullOrEmpty(member.Region.FileName)) {
 						FileName fn = new FileName(member.Region.FileName);
 						SD.FileService.JumpToFilePosition(fn, member.Region.BeginLine, member.Region.BeginColumn);
 					}
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerGenerator.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerGenerator.cs
index 2fd3560e6f..f10b094d8e 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerGenerator.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerGenerator.cs
@@ -284,7 +284,7 @@ namespace CSharpBinding.FormsDesigner
 				return false;
 			}
 			
-			return oldType.ReflectionName != newType.BaseType;
+			return oldType.GetDefinition().ReflectionName != newType.BaseType;
 		}
 		
 		string GenerateField(CodeMemberField newField)
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs
index 9144138095..b7c635c055 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs
@@ -57,6 +57,8 @@ namespace CSharpBinding.FormsDesigner
 		string GetComponentName(IComponent component)
 		{
 			string siteName = component.Site.Name;
+			if (GeneralOptionsPanel.GenerateVisualStudioStyleEventHandlers)
+				return siteName;
 			return Char.ToUpper(siteName[0]) + siteName.Substring(1);
 		}
 		
diff --git a/src/Main/SharpDevelop/Project/Solution.cs b/src/Main/SharpDevelop/Project/Solution.cs
index c1a3071d5f..9728623ff3 100644
--- a/src/Main/SharpDevelop/Project/Solution.cs
+++ b/src/Main/SharpDevelop/Project/Solution.cs
@@ -194,7 +194,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				foreach (var project in removedItems)
 					project.Dispose();
 				if (startupProjectWasRemoved || (solution.startupProject == null && addedItems.Contains(solution.AutoDetectStartupProject())))
-					solution.StartupProjectChanged(this, EventArgs.Empty);
+					solution.StartupProjectChanged(solution, EventArgs.Empty);
 			}
 		}