fixes for Rails 4 compatibility