Minor fixes of AST