Fix future parser issues