More changes for compatibility with ruby 1.8.6