More Rails 4 upgrade stuff