Fixed lifecycle problems