Fixes in ast to pass sanity test.