unified shutdown crash fix and other nits into existing patches