Pull and some minor fixes to ast
Fixed merge errors