diff --git a/data/templates/project/VBNet/ConsoleProject.xpt b/data/templates/project/VBNet/ConsoleProject.xpt
index 01b9edb959..a85590754a 100644
--- a/data/templates/project/VBNet/ConsoleProject.xpt
+++ b/data/templates/project/VBNet/ConsoleProject.xpt
@@ -26,7 +26,7 @@
 		</Options>
 		
 		<Project name = "${ProjectName}" directory = ".">
-			<Options />
+			<Options OutputType = "Exe" />
 			
 			<ProjectItems>
 				<Reference Include="System" />
diff --git a/data/templates/project/VBNet/Direct3DProject.xpt b/data/templates/project/VBNet/Direct3DProject.xpt
index bff6b623b1..30c6edefbd 100644
--- a/data/templates/project/VBNet/Direct3DProject.xpt
+++ b/data/templates/project/VBNet/Direct3DProject.xpt
@@ -25,7 +25,7 @@
 		</Options>
 		
 		<Project name = "${ProjectName}" directory = ".">
-			<Options/>
+			<Options OutputType = "WinExe" />
 			
 			<ProjectItems>
 				<Reference Include="System" />
diff --git a/data/templates/project/VBNet/Service.xpt b/data/templates/project/VBNet/Service.xpt
index 923da776ca..c80d0ab09d 100644
--- a/data/templates/project/VBNet/Service.xpt
+++ b/data/templates/project/VBNet/Service.xpt
@@ -23,7 +23,7 @@
 			<StartupProject>${ProjectName}</StartupProject>
 		</Options>
 		<Project name = "${ProjectName}" directory = ".">
-			<Options />
+			<Options OutputType = "Exe" />
 			
 			<ProjectItems>
 				<Reference Include="System" />
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj
index 599405e7ee..b980707db9 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj
@@ -36,8 +36,8 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Reference Include="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <Reference Include="System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <Reference Include="System.ServiceProcess, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <Reference Include="System.ServiceProcess, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BaseItems\BaseTextItem.cs" />
diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs b/src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs
index 9dd68e6c63..ef83b86e2f 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs
@@ -5,9 +5,13 @@
 //     <version>$Revision$</version>
 // </file>
 
+using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
+[assembly: CLSCompliant(false)]
+[assembly: StringFreezing()]
+
 [assembly: AssemblyTitle("ICSharpCode.TextEditor")]
 [assembly: AssemblyDescription("A .NET text editor control")]
 [assembly: AssemblyConfiguration("")]
@@ -19,6 +23,3 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyVersion("2.0.0.1")]
 
-[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("ICSharpCode.TextEditor.key")]
-//[assembly: AssemblyKeyName("")]
diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj b/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj
index 4fd4fc0993..865e298392 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj
@@ -15,14 +15,21 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Resources\ICSharpCode.TextEditor.snk</AssemblyOriginatorKeyFile>
     <RootNamespace>ICSharpCode.TextEditor</RootNamespace>
+    <DebugType>None</DebugType>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>134217728</BaseAddress>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <FileAlignment>4096</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
+    <DebugSymbols>false</DebugSymbols>
     <Optimize>False</Optimize>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <OutputPath>..\..\..\..\bin\</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>False</DebugSymbols>
diff --git a/src/Libraries/NRefactory/Project/Configuration/AssemblyInfo.cs b/src/Libraries/NRefactory/Project/Configuration/AssemblyInfo.cs
index a888544cfb..c2af67c754 100644
--- a/src/Libraries/NRefactory/Project/Configuration/AssemblyInfo.cs
+++ b/src/Libraries/NRefactory/Project/Configuration/AssemblyInfo.cs
@@ -5,9 +5,13 @@
 //     <version>$Revision$</version>
 // </file>
 
+using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
+[assembly: CLSCompliant(false)]
+[assembly: StringFreezing()]
+
 // Information about this assembly is defined by the following
 // attributes.
 //
@@ -32,8 +36,3 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyVersion("2.0.0.1")]
 
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("ICSharpCode.NRefactory.key")]
diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj b/src/Libraries/NRefactory/Project/NRefactory.csproj
index 84cd1def2c..4ec8f42cab 100644
--- a/src/Libraries/NRefactory/Project/NRefactory.csproj
+++ b/src/Libraries/NRefactory/Project/NRefactory.csproj
@@ -18,7 +18,7 @@
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <RegisterForComInterop>False</RegisterForComInterop>
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
+    <BaseAddress>100663296</BaseAddress>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <FileAlignment>4096</FileAlignment>
   </PropertyGroup>
diff --git a/src/Main/Base/Project/Configuration/AssemblyInfo.cs b/src/Main/Base/Project/Configuration/AssemblyInfo.cs
index 2a1fd723de..b0daf98766 100644
--- a/src/Main/Base/Project/Configuration/AssemblyInfo.cs
+++ b/src/Main/Base/Project/Configuration/AssemblyInfo.cs
@@ -10,6 +10,9 @@ using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
+[assembly: CLSCompliant(false)]
+[assembly: StringFreezing()]
+
 [assembly: AssemblyTitle("SharpDevelopBase")]
 [assembly: AssemblyDescription("The base add-in of SharpDevelop")]
 [assembly: AssemblyConfiguration("")]
@@ -21,4 +24,3 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyVersion("2.0.0.1")]
 
-[assembly: AssemblyDelaySign(false)]
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index dd587323eb..8cfe1065fa 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -16,7 +16,7 @@
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <RegisterForComInterop>False</RegisterForComInterop>
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
+    <BaseAddress>33554432</BaseAddress>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <FileAlignment>4096</FileAlignment>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs b/src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs
index 7f221a0db2..d70309c36b 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs
@@ -41,7 +41,9 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
 				return project.FileName;
 			}
 			set {
-				throw new NotSupportedException();
+				// possible when project is renamed by the user, project.FileName will be changed by the
+				// renaming code
+				OnTitleNameChanged(EventArgs.Empty);
 			}
 		}
 		
diff --git a/src/Main/Core/Project/Configuration/AssemblyInfo.cs b/src/Main/Core/Project/Configuration/AssemblyInfo.cs
index 4817e2d68d..6aca154584 100644
--- a/src/Main/Core/Project/Configuration/AssemblyInfo.cs
+++ b/src/Main/Core/Project/Configuration/AssemblyInfo.cs
@@ -9,7 +9,8 @@ using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly:CLSCompliant(false)]
+[assembly: CLSCompliant(true)]
+[assembly: StringFreezing()]
 
 [assembly: AssemblyTitle("ICSharpCode.Core")]
 [assembly: AssemblyDescription("The ICSharpCode Core containing the AddInTree and service Subsystem")]
@@ -22,4 +23,3 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyVersion("2.0.0.1")]
 
-[assembly: AssemblyDelaySign(false)]
diff --git a/src/Main/Core/Project/ICSharpCode.Core.csproj b/src/Main/Core/Project/ICSharpCode.Core.csproj
index 1bf9a9920d..d1907a2f31 100644
--- a/src/Main/Core/Project/ICSharpCode.Core.csproj
+++ b/src/Main/Core/Project/ICSharpCode.Core.csproj
@@ -13,9 +13,10 @@
     <OutputType>Library</OutputType>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Resources\ICSharpCode.Core.snk</AssemblyOriginatorKeyFile>
+    <BaseAddress>83886080</BaseAddress>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
+    <DebugSymbols>true</DebugSymbols>
     <Optimize>False</Optimize>
     <DebugType>Full</DebugType>
     <DocumentationFile>..\..\..\..\bin\ICSharpCode.Core.xml</DocumentationFile>
@@ -149,4 +150,4 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Main/StartUp/Project/Configuration/AssemblyInfo.template b/src/Main/StartUp/Project/Configuration/AssemblyInfo.template
index 6876d420a6..3a5263b731 100644
--- a/src/Main/StartUp/Project/Configuration/AssemblyInfo.template
+++ b/src/Main/StartUp/Project/Configuration/AssemblyInfo.template
@@ -10,6 +10,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 
 [assembly: CLSCompliant(true)]
+[assembly: StringFreezing()]
 
 // DO NOT EDIT AssemblyInfo.cs, it is recreated using AssemblyInfo.template whenever
 // StartUp is compiled.