Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r79c2105d7ec35f3caeb977f6e2cc1b494853d211 -r0901ce3d946bab5cae73edb102fc228a6533cb4b
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 79c2105d7ec35f3caeb977f6e2cc1b494853d211)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 0901ce3d946bab5cae73edb102fc228a6533cb4b)
@@ -62,7 +62,7 @@
 static U32 current4thLevelState;                            ///< current 4th level state.
 
 /// Interval (in task intervals) at which to publish operation mode data to CAN bus.
-static OVERRIDE_U32_T opModePublishInterval = { BROADCAST_TD_OP_MODE_INTERVAL, BROADCAST_TD_OP_MODE_INTERVAL, BROADCAST_TD_OP_MODE_INTERVAL, 0 };
+static OVERRIDE_U32_T opModePublishInterval;
 /// Local structure init for saving confirmation requests
 static CONFIRMATION_REQUEST_T confirmRequests[ MAX_PENDING_CONFIRM_REQUESTS ] =
                                                    { GENERIC_CONFIRM_ID_NONE, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
@@ -106,12 +106,16 @@
     }
 
     // Start in init mode
-    lastMode                 = MODE_INIT;
-    currentMode              = MODE_INIT;
-    currentSubMode           = 0;
-    currentSubState          = NO_SUB_STATE;
-    current4thLevelState     = NO_SUB_STATE;
-    broadcastModeIntervalCtr = DATA_PUBLISH_COUNTER_START_COUNT;
+    lastMode                         = MODE_INIT;
+    currentMode                      = MODE_INIT;
+    currentSubMode                   = 0;
+    currentSubState                  = NO_SUB_STATE;
+    current4thLevelState             = NO_SUB_STATE;
+    broadcastModeIntervalCtr         = DATA_PUBLISH_COUNTER_START_COUNT;
+    opModePublishInterval.data       = BROADCAST_TD_OP_MODE_INTERVAL;
+    opModePublishInterval.ovData     = BROADCAST_TD_OP_MODE_INTERVAL;
+    opModePublishInterval.ovInitData = BROADCAST_TD_OP_MODE_INTERVAL;
+    opModePublishInterval.override   = OVERRIDE_RESET;
 
     transitionToNewOperationMode( MODE_INIT );