diff --git a/v2/config.toml b/v2/config.toml
index 6cb5296..4328bf7 100644
--- a/v2/config.toml
+++ b/v2/config.toml
@@ -11,12 +11,14 @@ compile_sass = true
 generate_feed = true
 feed_filename = "rss.xml"
 
+# Whether to build a search index to be used later on by a JavaScript library
+build_search_index = false
+
+[markdown]
 # Whether to do syntax highlighting
 # Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola
 highlight_code = true
-
-# Whether to build a search index to be used later on by a JavaScript library
-build_search_index = false
+smart_punctuation = true
 
 [extra]
 author = "Wesley Moore"
diff --git a/v2/templates/rss.xml b/v2/templates/rss.xml
index b5c688d..bc6a51f 100644
--- a/v2/templates/rss.xml
+++ b/v2/templates/rss.xml
@@ -5,7 +5,7 @@
     <link>{{ config.base_url }}</link>
     <description>{{ config.description }}</description>
     <generator>Zola</generator>
-    <language>{{ config.default_language }}</language>
+    <language>{{ lang }}</language>
     <managingEditor>{{ config.extra.email }} ({{ config.extra.author }})</managingEditor>
     <webMaster>{{ config.extra.email }} ({{ config.extra.author }})</webMaster>
     <atom:link href="{{ feed_url }}" rel="self" type="application/rss+xml"/>
diff --git a/v2/templates/shortcodes/float_image.html b/v2/templates/shortcodes/float_image.html
index b108dd1..ccae4f3 100644
--- a/v2/templates/shortcodes/float_image.html
+++ b/v2/templates/shortcodes/float_image.html
@@ -1 +1,2 @@
-<img src="{{ resize_image(path=image, width=width * 2, op="fit_width") }}" width="{{ width }}" alt="{{ alt }}" class="image-{{ float }}" />
+{% set image = resize_image(path=image, width=width * 2, op="fit_width") %}
+<img src="{{ image.url }}" width="{{ width }}" alt="{{ alt }}" class="image-{{ float }}" />
diff --git a/v2/templates/shortcodes/resize_image.html b/v2/templates/shortcodes/resize_image.html
index 0cf7ae3..f4d7246 100644
--- a/v2/templates/shortcodes/resize_image.html
+++ b/v2/templates/shortcodes/resize_image.html
@@ -1 +1,2 @@
-<img src="{{ resize_image(path=image, width=width, op="fit_width", quality=quality | default(value=75)) }}" alt="{{ alt }}" />
+{% set image = resize_image(path=image, width=width, op="fit_width", quality=quality | default(value=75)) %}
+<img src="{{ image.url }}" alt="{{ alt }}" />