fixes for Rails 4.2