base lexer fixes