diff --git a/templates/index.html.erb b/templates/index.html.erb
index 7f59643..c0f1397 100644
--- a/templates/index.html.erb
+++ b/templates/index.html.erb
@@ -4,10 +4,10 @@
 <html lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title><%= name.capitalize %> IRC log server</title>
+    <title><%= @name.capitalize %> IRC log server</title>
 </head>
 <body>
-<h1>Welcome to <%= name.capitalize %> IRC log server</h1>
+<h1>Welcome to <%= @name.capitalize %> IRC log server</h1>
 <ul>
 <li><a href="/irclogs/">Channel Logs</a></li>
 <li><a href="/meetings/">Meeting Logs</a></li>
diff --git a/templates/vhost.erb b/templates/vhost.erb
index d564a3f..456d3cb 100644
--- a/templates/vhost.erb
+++ b/templates/vhost.erb
@@ -7,7 +7,7 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
   ServerName <%= @srvname %>
 <% if @serveraliases.is_a? Array -%>
 <% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
-<% elsif @serveraliases != '' -%>
+<% elsif ! ['', nil].include?(@serveraliases) -%>
 <%= " ServerAlias #{@serveraliases}" %>
 <% end -%>
   DocumentRoot <%= @docroot %>
