Correct parsing issues