avatar stream fixes