more ruby 2.0 fixes