Minor lexer updates