More shutdown tweaks.