[QE-1103] Tweaks for shutdown logic