UUID to GameId refactor - small corrections