minor lexer fixes