Few fixes to update lifecycle