Tweaks for Rails 4