diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
index 1089bef292..5a01c5d831 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
@@ -56,9 +56,6 @@
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <EmbeddedResource Include="Resources\BuildOptions.xfrm" />
     <EmbeddedResource Include="Resources\MyNamespaceSupportForCSharp.cs" />
-    <Compile Include="EventHandlerCompletionItemProvider.cs">
-      <DependentUpon>CSharpBinding.addin</DependentUpon>
-    </Compile>
     <Compile Include="Src\CSharpAdvancedHighlighter.cs" />
     <Compile Include="Src\CSharpBackgroundCompiler.cs" />
     <Compile Include="Src\CSharpBracketSearcher.cs" />
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultProperty.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultProperty.cs
index d4467bf443..ae948b6714 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultProperty.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultProperty.cs
@@ -87,6 +87,10 @@ namespace ICSharpCode.SharpDevelop.Dom {
 		{
 			DefaultProperty p = new DefaultProperty(Name, ReturnType, Modifiers, Region, BodyRegion, DeclaringType);
 			p.parameters = DefaultParameter.Clone(this.Parameters);
+			p.getterModifiers = this.getterModifiers;
+			p.setterModifiers = this.setterModifiers;
+			p.getterRegion = this.getterRegion;
+			p.setterRegion = this.setterRegion;
 			p.CopyDocumentationFrom(this);
 			p.accessFlags = this.accessFlags;
 			foreach (ExplicitInterfaceImplementation eii in InterfaceImplementations) {
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs
index cf24053d1a..17e70e2276 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs
@@ -748,9 +748,11 @@ namespace ICSharpCode.SharpDevelop.Dom.Refactoring
 		#region Override member
 		public virtual AttributedNode GetOverridingMethod(IMember baseMember, ClassFinder targetContext)
 		{
-			AttributedNode node = ConvertMember(baseMember, targetContext);
-			node.Modifier &= ~(Modifiers.Virtual | Modifiers.Abstract);
-			node.Modifier |= Modifiers.Override;
+			AbstractMember newMember = (AbstractMember)baseMember.Clone();
+			newMember.Modifiers &= ~(ModifierEnum.Virtual | ModifierEnum.Abstract);
+			newMember.Modifiers |= ModifierEnum.Override;
+			// set modifiers be before calling convert so that a body is generated
+			AttributedNode node = ConvertMember(newMember, targetContext);
 			node.Attributes.Clear(); // don't copy over attributes
 			
 			if (!baseMember.IsAbstract) {