Fix some lexer issues