fix more edge cases in operator lifecycles