Changes to support Rails 3.2.11 upgrade