diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
index 4895c59487..0b3c146709 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
@@ -62,9 +62,9 @@
 		<DialogPanel id    = "DebugOptions"
 		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
-		<DialogPanel id    = "Publish"
+		<!--<DialogPanel id    = "Publish"
 		             label = "${res:Dialog.ProjectOptions.Publish}"
-		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>
+		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>-->
 	</Path>
 	
 	<Path name = "/AddIns/DefaultTextEditor/Formatter/C#">
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs
index 124ff1d93c..25e802fb5c 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs
@@ -41,7 +41,7 @@ namespace VBNetBinding.FormattingStrategy
 			statements = new ArrayList();
 			statements.Add(new VBStatement("^if.*?(then| _)$", "^end ?if$", "End If", 1));
 			statements.Add(new VBStatement("\\bclass \\w+$", "^end class$", "End Class", 1));
-			statements.Add(new VBStatement("\\bnamespace \\w+$", "^end namespace$", "End Namespace", 1));
+			statements.Add(new VBStatement(@"\bnamespace \w+(\.\w+)*$", "^end namespace$", "End Namespace", 1));
 			statements.Add(new VBStatement("\\bmodule \\w+$", "^end module$", "End Module", 1));
 			statements.Add(new VBStatement("\\bstructure \\w+$", "^end structure$", "End Structure", 1));
 			statements.Add(new VBStatement("^while ", "^end while$", "End While", 1));
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
index cd91c6d966..e1b98efdfc 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
@@ -64,9 +64,9 @@
 		<DialogPanel id    = "DebugOptions"
 		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
-		<DialogPanel id    = "Publish"
+		<!--<DialogPanel id    = "Publish"
 		             label = "${res:Dialog.ProjectOptions.Publish}"
-		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>
+		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>-->
 		<DialogPanel id    = "ProjectImports"
 		             label = "${res:Dialog.ProjectOptions.ProjectImports}"
 		             class = "VBNetBinding.OptionPanels.ProjectImports"/>