Additional updates to remove gemspec warnings