work around a few shutting down issues