Fix some funky code for < 20 min shutdown warnings.