Lots of changes for Rails 3.1 compatibility.