Some (small) changes/fixes

I'm unable to test, but esp. the rating_key change is important.