More changes for Rails 4.1.0 support