Further Rails 4 compatibility updates
* Tests not necessarily passing yet...