Fix lifecycle operations