diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html
index dd3ebc4..bd417d7 100644
--- a/.themes/classic/source/_includes/article.html
+++ b/.themes/classic/source/_includes/article.html
@@ -12,7 +12,7 @@
 <div class="entry-content">{{ content }}</div>
 {% if index %}
   <footer>
-    {% if site.disqus_short_name and page.comments != false and site.disqus_show_comment_count == true %}
+    {% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %}
     <p><a class="comments-link" href="{% if index %}{{ permalink }}{% endif %}#disqus_thread">View comments &raquo;</a></p>
     {% endif %}
     {% if excerpted != 'false' %}
diff --git a/plugins/render_partial.rb b/plugins/render_partial.rb
index b6ebfe8..970a180 100644
--- a/plugins/render_partial.rb
+++ b/plugins/render_partial.rb
@@ -58,7 +58,17 @@ module Jekyll
         else
           partial = Liquid::Template.parse(contents)
           context.stack do
-            partial.render(context)
+            contents = partial.render(context)
+            
+            site = context.registers[:site]
+            ext = File.extname(@file)
+            converter = site.converters.find { |c| c.matches(ext) }
+            
+            if converter.nil?
+              contents
+            else
+              converter.convert(contents)
+            end
           end
         end
       end