Used the wrong LifecycleStage in some places