Fix Body issues.