Fix parsing errors