Fixed avatars and uploads