Some fixes in Lexer