diff --git a/app/assets/javascripts/comfy/admin/cms/base.js.coffee b/app/assets/javascripts/comfy/admin/cms/base.js.coffee
index fcfda9e41..3d2e71dca 100644
--- a/app/assets/javascripts/comfy/admin/cms/base.js.coffee
+++ b/app/assets/javascripts/comfy/admin/cms/base.js.coffee
@@ -1,3 +1,7 @@
+if jQuery.size == undefined
+  window.jQuery.fn.size = ->
+    this.length
+
 window.CMS ||= {}
 
 window.CMS.code_mirror_instances = [ ]
diff --git a/app/views/comfy/admin/cms/files/index.html.haml b/app/views/comfy/admin/cms/files/index.html.haml
index 36475f2d8..c01a9dc36 100644
--- a/app/views/comfy/admin/cms/files/index.html.haml
+++ b/app/views/comfy/admin/cms/files/index.html.haml
@@ -21,13 +21,17 @@
 
   = comfy_paginate @files
 
+:ruby
+  session_id = request.session_options[:id]
+  session_id_value = session_id.respond_to?(:public_id) ? session_id.public_id : session_id.to_s
+
 :javascript
   $(function(){
     window.CMS.uploader($("#cms-uploader"), {
       url: '#{comfy_admin_cms_site_files_path(@site, :source => :plupload, :category => params[:category])}',
       multipart_params: {
         '#{request_forgery_protection_token}': '#{form_authenticity_token}',
-        '#{Rails.application.config.session_options[:key]}': '#{request.session_options[:id]}'
+        '#{Rails.application.config.session_options[:key]}': '#{session_id_value}'
       }
     });
   });
diff --git a/comfortable_mexican_sofa.gemspec b/comfortable_mexican_sofa.gemspec
index aee44a3ec..33c1240c7 100644
--- a/comfortable_mexican_sofa.gemspec
+++ b/comfortable_mexican_sofa.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rails',             '>= 5.2.0', '< 6'
   s.add_dependency 'rails-i18n',        '>= 4.0.0'
-  s.add_dependency 'bootstrap_form',    '>= 2.2.0'
+  s.add_dependency 'bootstrap_form',    '>= 2.2.0', '< 3'
   s.add_dependency 'active_link_to',    '>= 1.0.0'
   s.add_dependency 'paperclip',         '>= 4.0.0'
   s.add_dependency 'kramdown',          '>= 1.0.0'
diff --git a/lib/comfortable_mexican_sofa/version.rb b/lib/comfortable_mexican_sofa/version.rb
index 2fb9f1736..f7deb24f4 100644
--- a/lib/comfortable_mexican_sofa/version.rb
+++ b/lib/comfortable_mexican_sofa/version.rb
@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.13.0"
+  VERSION = "1.13.1"
 end
\ No newline at end of file