End of game behavior improvements