Resolving shutdown issues