Fixed parser errors