diff --git a/templates/navigation-contribute.tpl.html b/templates/navigation-contribute.tpl.html
index f259b05..a9cc5eb 100644
--- a/templates/navigation-contribute.tpl.html
+++ b/templates/navigation-contribute.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% absolute_path(php_baseurl) %-->"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="<!--% php_baseurl %-->"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->help_out.html">Contribute »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Submit Show</a></li>
diff --git a/templates/navigation-get-shows.tpl.html b/templates/navigation-get-shows.tpl.html
index 3a7a684..38d2ff2 100644
--- a/templates/navigation-get-shows.tpl.html
+++ b/templates/navigation-get-shows.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% absolute_path(php_baseurl) %-->"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="<!--% php_baseurl %-->"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->syndication.html"><strong>Get Shows »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->eps/index.html">Full Episode Guide</a></li>
diff --git a/templates/navigation-give-shows.tpl.html b/templates/navigation-give-shows.tpl.html
index b67e5b3..11f154b 100644
--- a/templates/navigation-give-shows.tpl.html
+++ b/templates/navigation-give-shows.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% absolute_path(php_baseurl) %-->"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="<!--% php_baseurl %-->"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Give Shows »</strong></a>
 			<li><a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html">Info</a></li>
diff --git a/templates/page.tpl.html b/templates/page.tpl.html
index e95cab9..c086eee 100644
--- a/templates/page.tpl.html
+++ b/templates/page.tpl.html
@@ -24,7 +24,7 @@
   <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Ogg Vorbis RSS" href="<!--% absolute_path(baseurl) %-->hpr_ogg.rss" />
   <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Speex RSS" href="<!--% absolute_path(baseurl) %-->hpr_spx.rss" />
   <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio MP3 RSS" href="<!--% absolute_path(baseurl) %-->hpr_mp3.rss" />
-  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Comments RSS" href="<!--% absolute_path(php_baseurl) %-->comments_rss.php" />
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Comments RSS" href="<!--% php_baseurl %-->comments_rss.php" />
   <link rel="license" title="cc by 3.0"  href="https://creativecommons.org/licenses/by-sa/3.0/" />
   <link href="<!--% absolute_path(baseurl) %-->css/hpr.css" rel="stylesheet" />
   <!--[if IE]>