Fix build for AST changes