Fixed: A few shutdown issues.