Fix some end/start-new game bugs.