Fix parser errors