Better shutdown handling.