Fixes to life cycle support