More adjustments for Rails 4.1.6