Fixed some Ruby 1.9-2.0 compatiblity issues