Trying to robustify shutdown of cleanup tasks