Fixed deprecations and ruby 1.8.7 compatibility issues