* Other movements fixes