Bug fixes for newer rubies.