Fix parsing issues.