Fix bugs with avatar position