Fixed bootstrap shutdown so that it only shuts down singletons