Fix up AOT compilation