2 small fixes for ruby 2.0