Minor fixes in the lexer