Fixed parser errors & warnings