ManageIQ/manageiq

diff --git a/app/models/user.rb b/app/models/user.rb
index 5a0885121a..0548132b66 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -233,7 +233,7 @@ class User < ApplicationRecord
     return unless request
     return unless (session_id = request.session_options[:id])

-    sessions << Session.find_or_create_by(:session_id => session_id)
+    sessions << Session.find_or_create_by(:session_id => session_id.to_s)
   end

   def broadcast_revoke_sessions
diff --git a/lib/extensions/rack_session_dalli_patch.rb b/lib/extensions/rack_session_dalli_patch.rb
index 4c4ec35d34..317b684811 100644
--- a/lib/extensions/rack_session_dalli_patch.rb
+++ b/lib/extensions/rack_session_dalli_patch.rb
@@ -4,7 +4,7 @@ require "rack/session/dalli"
 module RackSessionDalliPatch
   def delete_sessions(session_ids)
     session_ids.each do |session_id|
-      destroy_session(ManageIQ::Session.fake_request.env, session_id, :drop => true)
+      delete_session(ManageIQ::Session.fake_request.env, session_id, :drop => true)
     end
   end

@@ -12,7 +12,7 @@ module RackSessionDalliPatch
   # cause a load to occur. Consequently, we need to manage things
   # carefully to prevent a deadlock between the Rails Interlock and
   # Dalli's own exclusive lock.
-  def with_block(*args)
+  def with_dalli_client(*args)
     ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
       super do |dc|
         ActiveSupport::Dependencies.interlock.running do
@@ -27,7 +27,7 @@ end
 # with_lock was renamed to with_block with a slightly different interface.
 # All versions since 2.7.7 have with_block now.
 # Additionally, we'll detect and warn if the method we depend on in our prepended module doesn't exist before we try to prepend it.
-%w[with_block destroy_session].each do |method|
+%w[with_dalli_client delete_session].each do |method|
   begin
     Rack::Session::Dalli.instance_method(method)
   rescue NameError => err