Fix regressions in the life cycle management