fix lex issues