Correct some end-of-game bugs.

https://bugzilla.gnome.org/show_bug.cgi?id=737410