ast gen and sjson fix