Fix some parser issues.