Tweaks as a result of ruby 1.8.x testing