Rails 3.2: Fixing deprecations