Minor tweaks to fix build on Ruby 1.9.3