diff --git a/Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml b/Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml
index 16fd703f6..a6f250313 100644
--- a/Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml
+++ b/Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml
@@ -265,10 +265,6 @@
     <MaxPublishRequestCount>20</MaxPublishRequestCount>
     <MaxSubscriptionCount>100</MaxSubscriptionCount>
     <MaxEventQueueSize>10000</MaxEventQueueSize>
-    <DurableSubscriptionsEnabled>true</DurableSubscriptionsEnabled>
-    <MaxDurableNotificationQueueSize>10000</MaxDurableNotificationQueueSize>
-    <MaxDurableEventQueueSize>10000</MaxDurableEventQueueSize>
-    <MaxDurableSubscriptionLifetimeInHours>10</MaxDurableSubscriptionLifetimeInHours>
     <!-- see https://opcfoundation-onlineapplications.org/profilereporting/ for list of available profiles -->
     <ServerProfileArray>
       <ua:String>http://opcfoundation.org/UA-Profile/Server/StandardUA2017</ua:String>
@@ -305,7 +301,10 @@
     <OperationLimits>
       <MaxNodesPerRead>2500</MaxNodesPerRead>
       <MaxNodesPerHistoryReadData>1000</MaxNodesPerHistoryReadData>
+      <MaxNodesPerHistoryReadEvents>1000</MaxNodesPerHistoryReadEvents>
       <MaxNodesPerWrite>2500</MaxNodesPerWrite>
+      <MaxNodesPerHistoryUpdateData>1000</MaxNodesPerHistoryUpdateData>
+      <MaxNodesPerHistoryUpdateEvents>1000</MaxNodesPerHistoryUpdateEvents>
       <MaxNodesPerMethodCall>2500</MaxNodesPerMethodCall>
       <MaxNodesPerBrowse>2500</MaxNodesPerBrowse>
       <MaxNodesPerRegisterNodes>2500</MaxNodesPerRegisterNodes>
@@ -315,6 +314,10 @@
     </OperationLimits>
     <AuditingEnabled>true</AuditingEnabled>
     <HttpsMutualTls>true</HttpsMutualTls>
+    <DurableSubscriptionsEnabled>true</DurableSubscriptionsEnabled>
+    <MaxDurableNotificationQueueSize>10000</MaxDurableNotificationQueueSize>
+    <MaxDurableEventQueueSize>10000</MaxDurableEventQueueSize>
+    <MaxDurableSubscriptionLifetimeInHours>10</MaxDurableSubscriptionLifetimeInHours>
   </ServerConfiguration>
   <Extensions>
     <ua:XmlElement>
diff --git a/Libraries/Opc.Ua.Server/Server/ServerInternalData.cs b/Libraries/Opc.Ua.Server/Server/ServerInternalData.cs
index d6096626c..d95a5951d 100644
--- a/Libraries/Opc.Ua.Server/Server/ServerInternalData.cs
+++ b/Libraries/Opc.Ua.Server/Server/ServerInternalData.cs
@@ -845,6 +845,7 @@ private void OnReadServerStatus(
                 {
                     serverStatusState.Timestamp = now;
                     serverStatusState.CurrentTime.Timestamp = now;
+                    serverStatusState.State.Timestamp = now;
                 }
             }
         }
diff --git a/Stack/Opc.Ua.Core/Schema/ApplicationConfiguration.cs b/Stack/Opc.Ua.Core/Schema/ApplicationConfiguration.cs
index dca79c278..a8b0a6876 100644
--- a/Stack/Opc.Ua.Core/Schema/ApplicationConfiguration.cs
+++ b/Stack/Opc.Ua.Core/Schema/ApplicationConfiguration.cs
@@ -1341,6 +1341,7 @@ private void Initialize()
             m_supportedPrivateKeyFormats = new string[] { "PFX", "PEM" };
             MaxTrustListSize = 0;
             MultiCastDnsEnabled = false;
+            OperationLimits = new OperationLimits();
             AuditingEnabled = false;
             HttpsMutualTls = true;
             DurableSubscriptionsEnabled = false;