Fixes for all sorts of ratings weirdness (bug 823488)