Fixed a couple restart bugs.