diff --git a/docker-compose.yml b/docker-compose.yml
index f8f380f..0f65ed0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   app:
     build: .
     working_dir: /blog
-    command: hugo server -v --bind "0.0.0.0" --port 1313 --watch -t soho
+    command: hugo server --logLevel info --bind "0.0.0.0" --port 1313 --watch -t soho
     ports:
       - "1313:1313"
     volumes:
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 2bd9767..dcdcbbd 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -74,7 +74,7 @@
   <script src="{{ . | relURL }}"></script>
   {{- end}}
 
-    {{ if not .Site.IsServer }}
+    {{ if not hugo.IsServer }}
       {{ template "_internal/google_analytics.html" . }}
     {{ end }}
 </body>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 3d46668..3dd0886 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -19,7 +19,7 @@
   {{ partial "share.html" . }}
   {{- end }}
 
-  {{ if (and .Site.DisqusShortname (ne .Params.DisableComments true) (ne .Params.disable_comments true)) -}}
+  {{ if (and .Site.Config.Services.Disqus.Shortname (ne .Params.DisableComments true) (ne .Params.disable_comments true)) -}}
   <div class="comments">
     <h2>Comments</h2>
     {{ template "_internal/disqus.html" . }}