More changes for Rails 4