Bit more of a shuffle round of the shutdown handling