Bring a few details in line with Rails 4.1