Fixes in application.rb