Correct and improve some parsers