Fix issues that break parsing.