Fixes for saving average rating in Challege model