Try to fix parser and ast