shutdown improvements