fix parse integration issues