diff --git a/app/models/report.rb b/app/models/report.rb
index 0364e5246e61..384ce39d4271 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -21,7 +21,7 @@ class Report < ApplicationRecord
 
   def self.inherited(child)
     child.instance_eval do
-      scoped_search :relation => :host,         :on => :name,  :complete_value => true, :rename => :host
+      scoped_search :relation => :host, :on => :name, :complete_value => true, :rename => :host
       scoped_search :relation => :host_owner,
         :on => :id,
         :complete_value => true,
@@ -30,16 +30,16 @@ def self.inherited(child)
         :validator => ->(value) { ScopedSearch::Validators::INTEGER.call(value) },
         :value_translation => ->(value) { value == 'current_user' ? User.current.id : value },
         :special_values => %w[current_user]
-      scoped_search :relation => :organization, :on => :name,  :complete_value => true, :rename => :organization
-      scoped_search :relation => :location,     :on => :name,  :complete_value => true, :rename => :location
-      scoped_search :relation => :messages,     :on => :value,                          :rename => :log, :only_explicit => true
-      scoped_search :relation => :sources,      :on => :value,                          :rename => :resource, :only_explicit => true
-      scoped_search :relation => :hostgroup,    :on => :name,  :complete_value => true, :rename => :hostgroup
-      scoped_search :relation => :hostgroup,    :on => :title, :complete_value => true, :rename => :hostgroup_fullname
-      scoped_search :relation => :hostgroup,    :on => :title, :complete_value => true, :rename => :hostgroup_title
+      scoped_search :relation => :organization, :on => :name, :complete_value => true, :rename => :organization
+      scoped_search :relation => :location, :on => :name, :complete_value => true, :rename => :location
+      scoped_search :relation => :messages, :on => :value, :rename => :log, :only_explicit => true
+      scoped_search :relation => :sources, :on => :value, :rename => :resource, :only_explicit => true
+      scoped_search :relation => :hostgroup, :on => :name, :complete_value => true, :rename => :hostgroup
+      scoped_search :relation => :hostgroup, :on => :title, :complete_value => true, :rename => :hostgroup_fullname
+      scoped_search :relation => :hostgroup, :on => :title, :complete_value => true, :rename => :hostgroup_title
 
       scoped_search :on => :reported_at, :complete_value => true, :default_order => :desc, :rename => :reported, :only_explicit => true, :aliases => [:last_report]
-      scoped_search :on => :host_id,     :complete_value => false, :only_explicit => true
+      scoped_search :on => :host_id, :complete_value => false, :only_explicit => true
       scoped_search :on => :origin
     end
     super
diff --git a/app/views/unattended/provisioning_templates/provision/kickstart_default.erb b/app/views/unattended/provisioning_templates/provision/kickstart_default.erb
index 6fe2d57d0464..e554cfd1862a 100644
--- a/app/views/unattended/provisioning_templates/provision/kickstart_default.erb
+++ b/app/views/unattended/provisioning_templates/provision/kickstart_default.erb
@@ -241,7 +241,9 @@ ntp
 chrony
 -ntp
 <% end -%>
+<% if rhel_compatible && os_major < 9 -%>
 wget
+<% end -%>
 @Core
 <% if host_param_true?('fips_enabled') -%>
 <%=   snippet 'fips_packages' %>
diff --git a/bundler.d/development.rb b/bundler.d/development.rb
index f17b5a2d91c7..4a55290370d1 100644
--- a/bundler.d/development.rb
+++ b/bundler.d/development.rb
@@ -11,7 +11,7 @@
   gem 'byebug'
   gem 'pry'
   gem 'pry-rails'
-  gem 'pry-byebug'
+#  gem 'pry-byebug'
   gem 'pry-doc'
   gem 'pry-stack_explorer'
   gem 'pry-remote' # will not work when running via foreman