Fix some future parser issues