small changes for Rails 4