Improve Core startup/shutdown.