Fix changeAvatar and changeAvatarState