Fixed to work with ruby 1.9

Just a few minor changes.