Fixes related to avatar image scaling and display