diff --git a/.themes/classic/source/404.markdown b/.themes/classic/source/404.markdown
index f30e7ef..42f300b 100644
--- a/.themes/classic/source/404.markdown
+++ b/.themes/classic/source/404.markdown
@@ -5,4 +5,4 @@ title: Page Not Found
 
 Oops, I couldn't find that page! Sorry about that.
 
-Maybe try the search box (top right), or look through the [archives](/archives)?
+Maybe try the search box (top right), or look through the [archives](/archives/)?
diff --git a/.themes/classic/source/_includes/custom/navigation.html b/.themes/classic/source/_includes/custom/navigation.html
index 5c9cae4..889af00 100644
--- a/.themes/classic/source/_includes/custom/navigation.html
+++ b/.themes/classic/source/_includes/custom/navigation.html
@@ -1,4 +1,4 @@
 <ul class="main-navigation">
   <li><a href="{{ root_url }}/">Blog</a></li>
-  <li><a href="{{ root_url }}/archives">Archives</a></li>
+  <li><a href="{{ root_url }}/archives/">Archives</a></li>
 </ul>
diff --git a/.themes/classic/source/index.html b/.themes/classic/source/index.html
index 96cf416..2bfe571 100644
--- a/.themes/classic/source/index.html
+++ b/.themes/classic/source/index.html
@@ -13,7 +13,7 @@ layout: default
     {% if paginator.next_page %}
       <a class="prev" href="{{paginator.next_page}}">&larr; Older</a>
     {% endif %}
-    <a href="/archives">Blog Archives</a>
+    <a href="/archives/">Blog Archives</a>
     {% if paginator.previous_page %}
     <a class="next" href="{{paginator.previous_page}}">Newer &rarr;</a>
     {% endif %}
diff --git a/Rakefile b/Rakefile
index c13b0ad..90d2feb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -200,10 +200,10 @@ task :isolate, :filename do |t, args|
   else
     filename = get_stdin("Enter a post file name: ")
   end
-  stash_dir = "#{source_dir}/#{stash_dir}"
-  FileUtils.mkdir(stash_dir) unless File.exist?(stash_dir)
+  full_stash_dir = "#{source_dir}/#{stash_dir}"
+  FileUtils.mkdir(full_stash_dir) unless File.exist?(full_stash_dir)
   Dir.glob("#{source_dir}/#{posts_dir}/*.*") do |post|
-    FileUtils.mv post, stash_dir unless post.include?(filename)
+    FileUtils.mv post, full_stash_dir unless post.include?(filename)
   end
 end