diff --git a/lib/sanitize.rb b/lib/sanitize.rb
index 32d4afc5..3fb3005d 100644
--- a/lib/sanitize.rb
+++ b/lib/sanitize.rb
@@ -32,12 +32,12 @@ module Sanitize
   def sanitize_rexml(tree)
     tokens = TreeWalkers.getTreeWalker('rexml').new(tree.to_ncr)
     HTMLSerializer.serialize(tokens, {:encoding=>'utf-8',
-      :quote_attr_values => 'true',
-      :minimize_boolean_attributes => 'false',
-      :use_trailing_solidus => 'true',
-      :space_before_trailing_solidus => 'true',
-      :omit_optional_tags => 'false',
-      :inject_meta_charset => 'false',
-      :sanitize => 'true'})
+      :quote_attr_values => true,
+      :minimize_boolean_attributes => false,
+      :use_trailing_solidus => true,
+      :space_before_trailing_solidus => true,
+      :omit_optional_tags => false,
+      :inject_meta_charset => false,
+      :sanitize => true})
   end
 end
diff --git a/vendor/plugins/HTML5lib/lib/html5lib/serializer.rb b/vendor/plugins/HTML5lib/lib/html5lib/serializer.rb
index 1e2ec4cb..0f090191 100644
--- a/vendor/plugins/HTML5lib/lib/html5lib/serializer.rb
+++ b/vendor/plugins/HTML5lib/lib/html5lib/serializer.rb
@@ -250,9 +250,9 @@ class HTMLSerializer
             require 'html5lib/sanitizer'
             treewalker = HTMLSanitizeFilter.new(treewalker)
         end
-#        if @omit_optional_tags
-#            treewalker = OptionalTagFilter.new(treewalker)
-#        end
+        if @omit_optional_tags
+            treewalker = OptionalTagFilter.new(treewalker)
+        end
 
         result = []
         treewalker.each do |token|