Fixes from unmerged PRs to get RJS working w Rails 4