Small changes for Rails 4 compatibility