diff --git a/libraries/AP_Motors/AP_Motors.h b/libraries/AP_Motors/AP_Motors.h
index 1d5f9e7184..0e8d72373b 100644
--- a/libraries/AP_Motors/AP_Motors.h
+++ b/libraries/AP_Motors/AP_Motors.h
@@ -79,7 +79,7 @@ public:
 
 	// arm, disarm or check status status of motors
 	virtual bool armed() { return _armed; };
-	virtual void armed(bool armed) { _armed = armed; };
+	virtual void armed(bool arm) { _armed = arm; };
 
 	// check or set status of auto_armed - controls whether autopilot can take control of throttle
 	// Note: this should probably be moved out of this class as it has little to do with the motors
diff --git a/libraries/AP_Motors/AP_MotorsMatrix.cpp b/libraries/AP_Motors/AP_MotorsMatrix.cpp
index 851f06365b..36d52f2da1 100644
--- a/libraries/AP_Motors/AP_MotorsMatrix.cpp
+++ b/libraries/AP_Motors/AP_MotorsMatrix.cpp
@@ -101,7 +101,7 @@ void AP_MotorsMatrix::output_min()
 	int8_t i;
 
 	// fill the motor_out[] array for HIL use and send minimum value to each motor
-	for( int8_t i=0; i<AP_MOTORS_MAX_NUM_MOTORS; i++ ) {
+	for( i=0; i<AP_MOTORS_MAX_NUM_MOTORS; i++ ) {
 		if( motor_enabled[i] ) {
 			motor_out[i] = _rc_throttle->radio_min;
 			_rc->OutputCh(_motor_to_channel_map[i], motor_out[i]);