Fix parser issues