Fix Rails 4 deprecation warnings