More work modifying to be compatible with ruby 1.9.3