Fix some other parsing issues.