Added some more Rails 4 compatibility stuff