Fix Ast and Lexer