More lexer fixes