Changes from AST code changes