ast fixes