Upgrade/rails3 deprecations