Ensure compatibility with ruby-1.9+

This fixes two incompatibilities with Ruby-1.9 when running ```bundle exec rake html```.