Fix compatiblity issues with yelp fork.