Fixing parser issues with conversion to new tree model