Fix event adoption and draft partials