Multiple parsing fixes