Rails 4.1 fixes