Fixes for using ruby 1.8.7