Resolved lexer issues