Correct some lexer errors