diff --git a/DCC.cpp b/DCC.cpp
index fb961d5..dad0c2b 100644
--- a/DCC.cpp
+++ b/DCC.cpp
@@ -940,8 +940,9 @@ void DCC::displayCabList(Print * stream) {
     for (int reg = 0; reg <= highestUsedReg; reg++) {
        if (speedTable[reg].loco>0) {
         used ++;
-        StringFormatter::send(stream,F("cab=%d, speed=%d, dir=%c \n"),
-           speedTable[reg].loco,  speedTable[reg].speedCode & 0x7f,(speedTable[reg].speedCode & 0x80) ? 'F':'R');
+        StringFormatter::send(stream,F("cab=%d, speed=%d, dir=%c blk=%d\n"),
+           speedTable[reg].loco,  speedTable[reg].speedCode & 0x7f,(speedTable[reg].speedCode & 0x80) ? 'F':'R',
+           speedTable[reg].blockOccupied);
        }
      }
      StringFormatter::send(stream,F("Used=%d, max=%d\n"),used,MAX_LOCOS);
diff --git a/DCCWaveform.cpp b/DCCWaveform.cpp
index 5c4d6d2..bfe3f91 100644
--- a/DCCWaveform.cpp
+++ b/DCCWaveform.cpp
@@ -234,11 +234,12 @@ void DCCWaveform::promotePendingPacket() {
         return;
       }
 
-    // Remember address bytes of last sent packet so that Railcom can
-    // work out where the channel2 data came from.
-    railcomLastAddressHigh=transmitPacket[0];
-    railcomLastAddressLow =transmitPacket[1];
-  
+    if (isMainTrack) {
+      // Remember address bytes of last sent packet so that Railcom can
+      // work out where the channel2 data came from.
+      railcomLastAddressHigh=transmitPacket[0];
+      railcomLastAddressLow =transmitPacket[1];
+    }
     
     if (packetPending) {
         // Copy pending packet to transmit packet