fixed more lifecycle issues