diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ClientValidationRegistrationCoordinator.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ClientValidationRegistrationCoordinator.cs
index 807f87c3a..7cc14e7d1 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ClientValidationRegistrationCoordinator.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ClientValidationRegistrationCoordinator.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using Orchard.DynamicForms.Elements;
 using Orchard.DynamicForms.Services;
@@ -54,5 +55,11 @@ namespace Orchard.DynamicForms.Handlers {
         void IElementEventHandler.BuildEditor(ElementEditorContext context) { }
         void IElementEventHandler.UpdateEditor(ElementEditorContext context) { }
         void IElementEventHandler.Removing(ElementRemovingContext context) { }
+        void IElementEventHandler.LayoutSaving(ElementSavingContext context) { }
+        void IElementEventHandler.Exporting(ExportElementContext context) { }
+        void IElementEventHandler.Exported(ExportElementContext context) { }
+        void IElementEventHandler.Importing(ImportElementContext context) { }
+        void IElementEventHandler.Imported(ImportElementContext context) { }
+        void IElementEventHandler.ImportCompleted(ImportElementContext context) { }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Elements/ElementSavingContext.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Elements/ElementSavingContext.cs
index 46e31754f..d8aeeb13c 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Elements/ElementSavingContext.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Elements/ElementSavingContext.cs
@@ -1,10 +1,11 @@
 namespace Orchard.Layouts.Framework.Elements {
     public class ElementSavingContext : LayoutSavingContext {
-        public ElementSavingContext(LayoutSavingContext stub) {
+        public ElementSavingContext(Element element, LayoutSavingContext stub) {
+            Element = element;
             Content = stub.Content;
             Updater = stub.Updater;
             Elements = stub.Elements;
         }
-        public Element Element { get; set; }
+        public Element Element { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Services/ElementManager.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Services/ElementManager.cs
index 8f42f414b..0e10ae9c9 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Services/ElementManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Services/ElementManager.cs
@@ -143,7 +143,7 @@ namespace Orchard.Layouts.Services {
             var elements = context.Elements.Flatten();
             
             foreach (var element in elements) {
-                var savingContext = new ElementSavingContext(context);
+                var savingContext = new ElementSavingContext(element, context);
                 _elementEventHandler.LayoutSaving(savingContext);
                 element.Descriptor.LayoutSaving(savingContext);
             }
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Orphans.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Orphans.cshtml
index a37ed0dca..5871e5798 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Orphans.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Orphans.cshtml
@@ -7,7 +7,7 @@
 }
 @if (widgets.Count() > 0) {
 <div id="widgets-orphans" class="widgets-container widgets-listed message-Warning">
-    <h3>@T("Widgets with problems.")</h3>
+    <h3>@T("Widgets with problems")</h3>
     <p>@T("These widgets aren't going to appear anywhere because they're missing the CommonPart from their content type. To fix these widgets, if you still want to keep them around, start by fixing their <a href=\"{0}\">Content Types</a>.", Url.Action("Index", "Admin", new { area = "Orchard.ContentTypes" }))</p>
     <ul>
         @foreach (WidgetPart widget in widgets) {