Updates for Rails 4.0