More fixes for Rails 3 downgrade