Fixing more parsing issues.