Fix a lot of broken AST cases