Some AST fixing