Update for Rails 4 compat