Messages and Ratings various fixes