Improve singleplayer handling