Fix velocity issues.