Avoid Rails 4.0 deprecations