Some changes for Rails 4.x and some offer amends