Small fixes, ruby 2.0.0