Further AST fixes