Restart fixes