Changes to have a proper OnStop() - fixed broken FindGames