additional updates for Rails 4.0.0 final