Rails 4.1.1 adjustments