Movement computation fixes