Merge: Fix some AST bugs