Fixed some lexer-parser errors.