diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
index 94e70c782..a3223dbc4 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
@@ -75,8 +75,11 @@ public class GameState {
             addPlayerCards(stringListEntry.getKey(), stringListEntry.getValue(), library);
         }
 
-        for (String playerId : playerOrder.getAllPlayers())
-            _recordingListeners.put(playerId, new GatheringParticipantCommunicationChannel(playerId));
+        for (String playerId : playerOrder.getAllPlayers()) {
+            GatheringParticipantCommunicationChannel listener = new GatheringParticipantCommunicationChannel(playerId);
+            listener.setPlayerOrder(playerOrder.getAllPlayers());
+            _recordingListeners.put(playerId, listener);
+        }
 
         for (String playerId : _gameStateListeners.keySet())
             sendStateToPlayer(playerId);
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
index 4ac5d6f1b..17ded4b1c 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
@@ -36,7 +36,7 @@ public class LotroServer extends AbstractServer {
         _lotroCardBlueprintLibrary = library;
         _chatServer = chatServer;
         _defaultCollection = new DefaultCardCollection(library);
-        for (int i = 1; i <= 4; i++) {
+        for (int i = 1; i <= 6; i++) {
             for (int j = 1; j <= 365; j++) {
                 String blueprintId = i + "_" + j;
                 try {
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
index 0bc73e007..eb2bc69b9 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
@@ -82,13 +82,13 @@ public abstract class DefaultLotroFormat implements LotroFormat {
             if (deck.getSites() == null)
                 throw new DeckInvalidException("Deck doesn't have sites");
             if (deck.getSites().size() != 9)
-                throw new DeckInvalidException("Deck doesn't have exactly nine sites");
+                throw new DeckInvalidException("Deck doesn't have nine sites");
             for (String site : deck.getSites()) {
                 LotroCardBlueprint siteBlueprint = _library.getLotroCardBlueprint(site);
                 if (siteBlueprint.getCardType() != CardType.SITE)
                     throw new DeckInvalidException("Card assigned as Site is not really a site");
                 if (siteBlueprint.getSiteBlock() != _siteBlock)
-                    throw new DeckInvalidException("Site is not from the block used: " + siteBlueprint.getName());
+                    throw new DeckInvalidException("Invalid site: " + siteBlueprint.getName());
             }
 
             if (_validSets.size() > 0) {