Corrections to sytax and Ruby 1.9/2 compatibility.