diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
index a8a430204b..cc1ba6ac10 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
@@ -91,6 +91,9 @@ namespace ICSharpCode.FormsDesigner
 			this.generator = generator;
 			p.BackColor    = Color.White;
 			p.RightToLeft = RightToLeft.No;
+			// Make sure auto-scaling is based on the correct font.
+			// This is required on Vista, I don't know why it works correctly in XP
+			p.Font = Control.DefaultFont;
 			
 			this.viewContent             = viewContent;
 			this.textAreaControlProvider = viewContent as ITextEditorControlProvider;
diff --git a/src/Main/Base/Project/Src/Project/AbstractProject.cs b/src/Main/Base/Project/Src/Project/AbstractProject.cs
index 16729a61cd..74b1e70504 100644
--- a/src/Main/Base/Project/Src/Project/AbstractProject.cs
+++ b/src/Main/Base/Project/Src/Project/AbstractProject.cs
@@ -259,6 +259,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		/// <summary>
 		/// Gets the list of available file item types. This member is thread-safe.
 		/// </summary>
+		[Browsable(false)]
 		public virtual ICollection<ItemType> AvailableFileItemTypes {
 			get {
 				return ItemType.DefaultFileItems;
diff --git a/src/Main/Base/Project/Src/Project/Solution/AbstractSolutionFolder.cs b/src/Main/Base/Project/Src/Project/Solution/AbstractSolutionFolder.cs
index d0da3105ea..b3f794988d 100644
--- a/src/Main/Base/Project/Src/Project/Solution/AbstractSolutionFolder.cs
+++ b/src/Main/Base/Project/Src/Project/Solution/AbstractSolutionFolder.cs
@@ -29,6 +29,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		/// All members lock on this object, but if you manipulate underlying structures
 		/// (such as the MSBuild project for MSBuildBasedProjects) directly, you will have to lock on this object.
 		/// </summary>
+		[Browsable(false)]
 		public object SyncRoot {
 			get { return syncRoot; }
 		}
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/Condition.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/Condition.cs
index 9329a76ca9..7a0ea9c975 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddIn/Condition.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/Condition.cs
@@ -88,11 +88,11 @@ namespace ICSharpCode.Core
 							case "Not":
 								condition = NegatedCondition.Read(reader);
 								goto exit;
-							case "Condition":
-								condition = Condition.Read(reader);
-								goto exit;
+							default:
+								throw new AddInLoadException("Invalid element name '" + reader.LocalName
+								                             + "', the first entry in a ComplexCondition " +
+								                             "must be <And>, <Or> or <Not>");
 						}
-						break;
 				}
 			}
 		exit:
@@ -127,6 +127,10 @@ namespace ICSharpCode.Core
 							case "Condition":
 								conditions.Add(Condition.Read(reader));
 								break;
+							default:
+								throw new AddInLoadException("Invalid element name '" + reader.LocalName
+								                             + "', entries in a <" + endElement + "> " +
+								                             "must be <And>, <Or>, <Not> or <Condition>");
 						}
 						break;
 				}