diff --git a/src/Orchard.Web/Core/Common/DateEditor/DateEditorHandler.cs b/src/Orchard.Web/Core/Common/DateEditor/DateEditorHandler.cs
index 9c7d48465..f31bebdcd 100644
--- a/src/Orchard.Web/Core/Common/DateEditor/DateEditorHandler.cs
+++ b/src/Orchard.Web/Core/Common/DateEditor/DateEditorHandler.cs
@@ -7,7 +7,7 @@ namespace Orchard.Core.Common.DateEditor {
     public class DateEditorHandler : ContentHandler {
         public DateEditorHandler() {
             OnPublished<CommonPart>((context, part) => {
-                var settings = part.ContentItem.TypeDefinition.Settings.GetModel<DateEditorSettings>();
+                var settings = part.TypePartDefinition.Settings.GetModel<DateEditorSettings>();
                 if (!settings.ShowDateEditor) {
                     return;
                 }
diff --git a/src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml b/src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml
index edcbfadec..431db9271 100644
--- a/src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml
@@ -1,4 +1,4 @@
-@model Orchard.Core.Common.DateEditor.DateEditorViewModel;
+@model Orchard.Core.Common.DateEditor.DateEditorViewModel
 @{
 	var DateEditor = Model;
     Script.Require("jQueryUtils_TimePicker");
diff --git a/src/Orchard.Web/Core/Common/Views/Parts.Common.Owner.Edit.cshtml b/src/Orchard.Web/Core/Common/Views/Parts.Common.Owner.Edit.cshtml
index 8236e2d9d..94eebc95b 100644
--- a/src/Orchard.Web/Core/Common/Views/Parts.Common.Owner.Edit.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/Parts.Common.Owner.Edit.cshtml
@@ -1,4 +1,4 @@
-@model Orchard.Core.Common.OwnerEditor.OwnerEditorViewModel;
+@model Orchard.Core.Common.OwnerEditor.OwnerEditorViewModel
 @{
 	var OwnerEditor = Model;
 }