lifecycle issue fixes