Added fixes for sidekiq