Making shutdown more instant