Issue avatar fixes