Cleanup warnings for Ruby 2.1