Fix some parsing issue.