diff --git a/src/Main/Base/Project/Src/TextEditor/Bookmarks/ClassMemberBookmark.cs b/src/Main/Base/Project/Src/TextEditor/Bookmarks/ClassMemberBookmark.cs
index a6f92a39ae..9d4842f89c 100644
--- a/src/Main/Base/Project/Src/TextEditor/Bookmarks/ClassMemberBookmark.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Bookmarks/ClassMemberBookmark.cs
@@ -32,11 +32,20 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 		}
 		
 		public ClassMemberBookmark(IDocument document, IMember member)
-			: base(document, Math.Min(document.TotalNumberOfLines - 1, member.Region.BeginLine - 1))
+			: base(document, GetLineNumberFromMember(document, member))
 		{
 			this.member = member;
 		}
 		
+		static int GetLineNumberFromMember(IDocument document, IMember member)
+		{
+			int line = member.Region.BeginLine - 1;
+			if (document != null && line >= document.TotalNumberOfLines)
+				return document.TotalNumberOfLines - 1;
+			else
+				return line;
+		}
+		
 		public const string ContextMenuPath = "/SharpDevelop/ViewContent/DefaultTextEditor/ClassMemberContextMenu";
 		
 		public override bool Click(Control parent, MouseEventArgs e)
diff --git a/src/Main/StartUp/Project/StartUp.csproj b/src/Main/StartUp/Project/StartUp.csproj
index 45accba64e..ba4e8796a5 100644
--- a/src/Main/StartUp/Project/StartUp.csproj
+++ b/src/Main/StartUp/Project/StartUp.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -22,6 +22,8 @@
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <DelaySign>False</DelaySign>
     <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>Full</DebugType>
@@ -51,12 +53,16 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="SharpDevelopMain.cs" />
-    <EmbeddedResource Include="Resources\BitmapResources.resources" />
-    <None Include="SharpDevelop.exe.manifest">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <EmbeddedResource Include="Resources\BitmapResources.resources">
+      <LogicalName>Resources.BitmapResources.resources</LogicalName>
+    </EmbeddedResource>
+    <None Include="app.manifest">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </None>
     <EmbeddedResource Include="Resources\SplashScreen.jpg" />
-    <EmbeddedResource Include="Resources\StringResources.resources" />
+    <EmbeddedResource Include="Resources\StringResources.resources">
+      <LogicalName>Resources.StringResources.resources</LogicalName>
+    </EmbeddedResource>
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <None Include="SharpDevelop.exe.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/src/Main/StartUp/Project/SharpDevelop.exe.manifest b/src/Main/StartUp/Project/app.manifest
similarity index 100%
rename from src/Main/StartUp/Project/SharpDevelop.exe.manifest
rename to src/Main/StartUp/Project/app.manifest
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 1ed646239c..d2901ee206 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -168,7 +168,6 @@
 							</Component>
 							<Component Id="SharpDevelopExeFiles" Guid="B9427DC8-6C86-4D1A-B3DC-1B0E0F1F1DC1" DiskId="1">
 								<File Source="..\..\bin\SharpDevelop.exe.config" Name="sharpdev.con" Id="SharpDevelop.exe.config" LongName="SharpDevelop.exe.config" />
-								<File Source="..\..\bin\SharpDevelop.exe.manifest" Name="sharpdev.man" Id="SharpDevelop.exe.manifest" LongName="SharpDevelop.exe.manifest" />
 							</Component>
 							<Component Id="ICSharpCodeBuildTasksDll" Guid="E94FCC8C-9741-45EF-AFDA-9F9CF02BF3F7" DiskId="1">
 								<File Source="..\..\bin\ICSharpCode.Build.Tasks.dll" Name="ICBuild.dll" Id="ICSharpCode.Build.Tasks.dll" LongName="ICSharpCode.Build.Tasks.dll" Assembly=".net" AssemblyApplication="ICSharpCode.Build.Tasks.dll" AssemblyManifest="ICSharpCode.Build.Tasks.dll" KeyPath="yes" />