diff --git a/Ntp.Analyzer/Page/BootstrapPeerSummaryPageBuilder.cs b/Ntp.Analyzer/Page/BootstrapPeerSummaryPageBuilder.cs
index d21b4c8b..9ab14c90 100644
--- a/Ntp.Analyzer/Page/BootstrapPeerSummaryPageBuilder.cs
+++ b/Ntp.Analyzer/Page/BootstrapPeerSummaryPageBuilder.cs
@@ -30,7 +30,7 @@ using Ntp.Analyzer.Config.Navigation;
 using Ntp.Analyzer.Config.Page;
 using Ntp.Analyzer.Export;
 using Ntp.Analyzer.Render;
-using Ntp.Analyzer.Render.summary;
+using Ntp.Analyzer.Render.Summary;
 
 namespace Ntp.Analyzer.Page
 {
diff --git a/Ntp.Analyzer/Page/DefaultPeerSummaryPageBuilder.cs b/Ntp.Analyzer/Page/DefaultPeerSummaryPageBuilder.cs
index 0d41a69f..9eb05a2b 100644
--- a/Ntp.Analyzer/Page/DefaultPeerSummaryPageBuilder.cs
+++ b/Ntp.Analyzer/Page/DefaultPeerSummaryPageBuilder.cs
@@ -29,7 +29,7 @@ using System.IO;
 using Ntp.Analyzer.Config.Page;
 using Ntp.Analyzer.Export;
 using Ntp.Analyzer.Render;
-using Ntp.Analyzer.Render.summary;
+using Ntp.Analyzer.Render.Summary;
 
 namespace Ntp.Analyzer.Page
 {
diff --git a/Ntp.Analyzer/Render/Summary/BootstrapSummaryGraphRender.cs b/Ntp.Analyzer/Render/Summary/BootstrapSummaryGraphRender.cs
index 73a84f0e..c0d99eb1 100644
--- a/Ntp.Analyzer/Render/Summary/BootstrapSummaryGraphRender.cs
+++ b/Ntp.Analyzer/Render/Summary/BootstrapSummaryGraphRender.cs
@@ -34,7 +34,7 @@ using Ntp.Analyzer.Config.Destination;
 using Ntp.Analyzer.Config.Graph;
 using Ntp.Analyzer.Config.Page;
 
-namespace Ntp.Analyzer.Render.summary
+namespace Ntp.Analyzer.Render.Summary
 {
     public sealed class BootstrapSummaryGraphRender : HtmlObjectRender
     {
diff --git a/Ntp.Analyzer/Render/Summary/BootstrapSummaryPageRender.cs b/Ntp.Analyzer/Render/Summary/BootstrapSummaryPageRender.cs
index bd8e5d8b..02868bc4 100644
--- a/Ntp.Analyzer/Render/Summary/BootstrapSummaryPageRender.cs
+++ b/Ntp.Analyzer/Render/Summary/BootstrapSummaryPageRender.cs
@@ -26,7 +26,7 @@
 
 using System;
 
-namespace Ntp.Analyzer.Render.summary
+namespace Ntp.Analyzer.Render.Summary
 {
     public sealed class BootstrapSummaryPageRender : BootstrapPageRender
     {
diff --git a/Ntp.Analyzer/Render/Summary/DefaultPeerSummaryGraphRender.cs b/Ntp.Analyzer/Render/Summary/DefaultPeerSummaryGraphRender.cs
index 91f6e1f2..b5d76875 100644
--- a/Ntp.Analyzer/Render/Summary/DefaultPeerSummaryGraphRender.cs
+++ b/Ntp.Analyzer/Render/Summary/DefaultPeerSummaryGraphRender.cs
@@ -34,7 +34,7 @@ using Ntp.Analyzer.Config.Destination;
 using Ntp.Analyzer.Config.Graph;
 using Ntp.Analyzer.Config.Page;
 
-namespace Ntp.Analyzer.Render.summary
+namespace Ntp.Analyzer.Render.Summary
 {
     public sealed class DefaultPeerSummaryGraphRender : HtmlObjectRender
     {
diff --git a/Ntp.Analyzer/Render/Summary/DefaultPeerSummaryPageRender.cs b/Ntp.Analyzer/Render/Summary/DefaultPeerSummaryPageRender.cs
index 2ac75aaa..3751364c 100644
--- a/Ntp.Analyzer/Render/Summary/DefaultPeerSummaryPageRender.cs
+++ b/Ntp.Analyzer/Render/Summary/DefaultPeerSummaryPageRender.cs
@@ -26,7 +26,7 @@
 
 using System.Text;
 
-namespace Ntp.Analyzer.Render.summary
+namespace Ntp.Analyzer.Render.Summary
 {
     public sealed class DefaultPeerSummaryPageRender : HtmlObjectRender
     {
diff --git a/Ntp.Analyzer/Statistics/StatusBuilder.cs b/Ntp.Analyzer/Statistics/StatusBuilder.cs
index f0a611e3..0b7f5671 100644
--- a/Ntp.Analyzer/Statistics/StatusBuilder.cs
+++ b/Ntp.Analyzer/Statistics/StatusBuilder.cs
@@ -70,7 +70,7 @@ namespace Ntp.Analyzer.Statistics
                     Peer peer = DataFace.Instance.Peers.SingleOrDefault (p => p.Ip == peerStatus.Remote);
                     if (peer != null) {
                         if (peer.OrgId.HasValue) {
-                            timeServer = DataFace.Instance.Servers [entry.OrgId.Value];
+                            timeServer = DataFace.Instance.Servers [peer.OrgId.Value];
                         } else {
                             peerId = peer.Id;
                         }