Index: sources/update/Package.cpp
===================================================================
diff -u -r61c46e9379ca82d826fbe7fae018b8362a107d9d -rd49c2482be5cf36868b964681d0e93fb3abe5b7b
--- sources/update/Package.cpp	(.../Package.cpp)	(revision 61c46e9379ca82d826fbe7fae018b8362a107d9d)
+++ sources/update/Package.cpp	(.../Package.cpp)	(revision d49c2482be5cf36868b964681d0e93fb3abe5b7b)
@@ -672,7 +672,7 @@
  * \brief   Reboot to run the firmware (both HD and DG) apps if they are valid.
  */
 void Package::rebootFW() {
-    const int retryRebootEffort = 4;
+    //const int retryRebootEffort = 4;
     SwUpdate::MsgLink link(KBPS_WIRE);
 
     for (std::size_t ii = 0; ii < 2; ii++) {
@@ -681,7 +681,8 @@
         msg.cmd = SwUpdate_FormCommand(ii == 0 ? HD : DG, RunApp);
         msg.rand = SwUpdate::UiProtocol::getNextMsgSeed();
         SwUpdate_createSecurity((uint8 *)&msg, sizeof(SwUpdateCommand));
-        link.sendOk(SwUpdateCanMsgIds::CommandId, (uint8 *)&msg, retryRebootEffort);
+        // Doesn't build, inlined link call and it has a memcpy line 175 failure.
+        //   link.sendOk(SwUpdateCanMsgIds::CommandId, (uint8 *)&msg, retryRebootEffort);
     }
 }
 
Index: sources/update/UpdateProtocol.h
===================================================================
diff -u -r110fa8df5fc77830fa05d04af55b349dd8f9c6d9 -rd49c2482be5cf36868b964681d0e93fb3abe5b7b
--- sources/update/UpdateProtocol.h	(.../UpdateProtocol.h)	(revision 110fa8df5fc77830fa05d04af55b349dd8f9c6d9)
+++ sources/update/UpdateProtocol.h	(.../UpdateProtocol.h)	(revision d49c2482be5cf36868b964681d0e93fb3abe5b7b)
@@ -59,13 +59,13 @@
  * The app msgs are < 0x8000. We start there.
  */
 typedef enum SwUpdateCanMsgIds {
-    CommandId = 0x8001,          ///< SwUpdateCommand ID.
-    DataBufferId_HD_FW = 0x8002,    ///< SwUpdateDataBuffer ID for FW.
-    DataBufferId_HD_FPGA = 0x8003,  ///< SwUpdateDataBuffer ID for FPGA.
-    DataBufferId_DG_FW = 0x8004,    ///< SwUpdateDataBuffer ID for FW.
-    DataBufferId_DG_FPGA = 0x8005,  ///< SwUpdateDataBuffer ID for FPGA.
-    ResponseId = 0x8006,         ///< SwUpdateResponse ID.
-    VerifyId = 0x8007,           ///< SwUpdateResponse ID.
+    CommandId = 0x801,          ///< SwUpdateCommand ID.
+    DataBufferId_HD_FW = 0x802,    ///< SwUpdateDataBuffer ID for FW.
+    DataBufferId_HD_FPGA = 0x803,  ///< SwUpdateDataBuffer ID for FPGA.
+    DataBufferId_DG_FW = 0x804,    ///< SwUpdateDataBuffer ID for FW.
+    DataBufferId_DG_FPGA = 0x805,  ///< SwUpdateDataBuffer ID for FPGA.
+    ResponseId = 0x806,         ///< SwUpdateResponse ID.
+    VerifyId = 0x807,           ///< SwUpdateResponse ID.
     NumMsgIds               ///< Always last.    
 } SwUpdateCanMsgIds;