Fix various ratings issues more