AST fixes