Updates for Rails 4 compatibility