Small fixes in lexer.