Minor tweaks for Rails 4;