Fixed lex bugs