Fixing Rails 3.2 deprecations