diff --git a/APMrover2/APMrover2.cpp b/APMrover2/APMrover2.cpp
index 626ca51e0f..dd4f146fa3 100644
--- a/APMrover2/APMrover2.cpp
+++ b/APMrover2/APMrover2.cpp
@@ -100,7 +100,7 @@ void Rover::setup()
     init_ardupilot();
 
     // initialise the main loop scheduler
-    scheduler.init(&scheduler_tasks[0], sizeof(scheduler_tasks)/sizeof(scheduler_tasks[0]));
+    scheduler.init(&scheduler_tasks[0], ARRAY_SIZE(scheduler_tasks));
 }
 
 /*
diff --git a/APMrover2/Log.cpp b/APMrover2/Log.cpp
index a80e0f4145..06401b80c8 100644
--- a/APMrover2/Log.cpp
+++ b/APMrover2/Log.cpp
@@ -394,7 +394,7 @@ const LogStructure Rover::log_structure[] PROGMEM = {
 
 void Rover::log_init(void)
 {
-	DataFlash.Init(log_structure, sizeof(log_structure)/sizeof(log_structure[0]));
+	DataFlash.Init(log_structure, ARRAY_SIZE(log_structure));
     if (!DataFlash.CardInserted()) {
         gcs_send_text_P(SEVERITY_LOW, PSTR("No dataflash card inserted"));
         g.log_bitmask.set(0);