Rating system fixes