Recent fixes for Ruby 2.0 and additional header support