Further fixes to make life-cycle work