diff --git a/app/models/spree/taxon.rb b/app/models/spree/taxon.rb
index f17bb48f97..81b9f8e824 100644
--- a/app/models/spree/taxon.rb
+++ b/app/models/spree/taxon.rb
@@ -56,7 +56,7 @@ module Spree
 
     def pretty_name
       ancestor_chain = ancestors.inject("") do |name, ancestor|
-        name += "#{ancestor.name} -> "
+        name + "#{ancestor.name} -> "
       end
       ancestor_chain + name.to_s
     end
diff --git a/lib/spree/core/controller_helpers/common.rb b/lib/spree/core/controller_helpers/common.rb
index 27684873b4..28090659b6 100644
--- a/lib/spree/core/controller_helpers/common.rb
+++ b/lib/spree/core/controller_helpers/common.rb
@@ -66,7 +66,7 @@ module Spree
           #   The layout to render can be set inside Spree configuration with the +:layout+ option.
           # Default layout is: +app/views/spree/layouts/spree_application+
           def get_layout
-            layout ||= Spree::Config[:layout]
+            Spree::Config[:layout]
           end
         end
       end