Fixing some lexer rules