Modifications to allow SMP mode to restart.