diff --git a/ccsds_types.h b/ccsds_types.h
--- a/ccsds_types.h
+++ b/ccsds_types.h
@@ -19,6 +19,7 @@
 #define CCSDS_TC_TM_PACKET_OFFSET   7
 #define PROTID_RES_APP              3
 #define CCSDS_TELEMETRY_HEADER_LENGTH (16+4)
+#define CCSDS_TC_HEADER_LENGTH      10
 #define CCSDS_TM_PKT_MAX_SIZE 4412
 #define CCSDS_TELECOMMAND_HEADER_LENGTH (10+4)
 #define CCSDS_TC_PKT_MAX_SIZE 232   // (228+3) with 3 for Prot ID, Reserved and User App bytes, SHALL BE A MULTIPLE OF 4
@@ -615,7 +616,7 @@ typedef struct {
     unsigned char serviceType;
     unsigned char serviceSubType;
     unsigned char sourceID;
-    unsigned char dataAndCRC[CCSDS_TC_PKT_MAX_SIZE-10];
+    unsigned char dataAndCRC[CCSDS_TC_PKT_MAX_SIZE-CCSDS_TC_HEADER_LENGTH];
 } ccsdsTelecommandPacket_t;
 
 //**********
@@ -876,7 +877,8 @@ typedef struct {
 
     //******************
     // SOURCE DATA repeated N times with N in [0 .. PA_LFR_KCOEFF_BLK_NR]
-    unsigned char kcoeff_blks[3900]; // one blk is 2 + 4 * 32 = 130 bytes, 30 blks max in one packet (30 * 130 = 3900)
+    // one blk is 2 + 4 * 32 = 130 bytes, 30 blks max in one packet (30 * 130 = 3900)
+    unsigned char kcoeff_blks[KCOEFF_BLK_SIZE * KCOEFF_BLK_NR_PKT1];
 
 } Packet_TM_LFR_KCOEFFICIENTS_DUMP_t;