Rails 4.1 compatibility updates