Further changes in lexer