fix up disposal ordering on shutdown