[yelp] fix some outstanding stupidities