Tweak riak client due to 17.0 types.