Fix rating issues