Fix bugs in Avatar