diff --git a/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs b/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs
index 86e1621441..413f31d79e 100644
--- a/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Models;
 namespace Umbraco.Core.PropertyEditors
 {
     /// <summary>
-    /// Provides a default implementation for <see ref="IPropertyIndexValue">, returning a single field to index containing the property value.
+    /// Provides a default implementation for <see ref="IPropertyIndexValueFactory">, returning a single field to index containing the property value.
     /// </summary>
     public class DefaultPropertyIndexValueFactory : IPropertyIndexValueFactory
     {
diff --git a/src/Umbraco.Core/PropertyEditors/IDataEditor.cs b/src/Umbraco.Core/PropertyEditors/IDataEditor.cs
index 917cd20dfc..f109620ad9 100644
--- a/src/Umbraco.Core/PropertyEditors/IDataEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/IDataEditor.cs
@@ -67,7 +67,7 @@ namespace Umbraco.Core.PropertyEditors
         IConfigurationEditor GetConfigurationEditor();
 
         /// <summary>
-        /// Gets the value indexer for the editor.
+        /// Gets the index value factory for the editor.
         /// </summary>
         IPropertyIndexValueFactory PropertyIndexValueFactory { get; }
     }
diff --git a/src/Umbraco.Core/PropertyEditors/IPropertyIndexValueFactory.cs b/src/Umbraco.Core/PropertyEditors/IPropertyIndexValueFactory.cs
index bb2f2aacf3..e303a53f5f 100644
--- a/src/Umbraco.Core/PropertyEditors/IPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Core/PropertyEditors/IPropertyIndexValueFactory.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Models;
 namespace Umbraco.Core.PropertyEditors
 {
     /// <summary>
-    /// Represents a property value indexer.
+    /// Represents a property index value factory.
     /// </summary>
     public interface IPropertyIndexValueFactory
     {
diff --git a/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs
index 6d35580afa..990aa32ddd 100644
--- a/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs
+++ b/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs
@@ -102,8 +102,6 @@ namespace Umbraco.Web.Components
             _messenger = serverMessenger as BatchedDatabaseServerMessenger;
             if (_messenger == null) throw new Exception("panic: messenger");
 
-            _messenger.Startup();
-
             _runtime = runtime;
             _logger = logger;
             _registrationService = registrationService;
@@ -116,6 +114,9 @@ namespace Umbraco.Web.Components
 
             //We will start the whole process when a successful request is made
             UmbracoModule.RouteAttempt += RegisterBackgroundTasksOnce;
+
+            // must come last, as it references some _variables
+            _messenger.Startup();
         }
 
         /// <summary>