Lifecycle tweaks and fixes