Fix regressions introduced with annotated lifecycle method