diff --git a/app/models/proxy_config.rb b/app/models/proxy_config.rb
index 1acfb74d60..786a21fe99 100644
--- a/app/models/proxy_config.rb
+++ b/app/models/proxy_config.rb
@@ -104,6 +104,7 @@ def update_version
 
     # Read the value
     self.version = config.connection.select_value(config.select(:version)).to_i
+    clear_attribute_changes [:version]
   end
 
   def clone_to(environment:)
diff --git a/config/initializers/money.rb b/config/initializers/money.rb
index b73196d453..8753f3bd88 100644
--- a/config/initializers/money.rb
+++ b/config/initializers/money.rb
@@ -1,9 +1,10 @@
 require 'three_scale/money_conversions'
+require 'three_scale/has_money'
+
+ActiveSupport.on_load(:active_record) do
+  include ThreeScale::HasMoney
+end
 
 Rails.application.config.to_prepare do
   ActionController::Base.helper(ThreeScale::MoneyHelper)
-
-  ActiveSupport.on_load(:active_record) do
-    ActiveRecord::Base.include ThreeScale::HasMoney
-  end
 end
diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/lib/three_scale/has_money.rb b/lib/three_scale/has_money.rb
similarity index 100%
rename from app/lib/three_scale/has_money.rb
rename to lib/three_scale/has_money.rb