Fix avatar movement issues